From 62d48aed4d269bb5586da9ab9d94f0ecd63448ae Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 13 Nov 2007 20:54:27 +0000 Subject: [PATCH 01/60] * Lots of updated versioned build-depends * Added versioned conflicts to older plugin-packages to make sure these are in sync git-svn-id: file:///svn/pkg-evolution/experimental/evolution@909 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 13 ++++++++++++- debian/control | 34 ++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83da35567a..0476a4688c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,19 @@ evolution (2.21.2-0) experimental; urgency=low * New upstream release + * Bump build-depends on the following: + - gnome-icon-theme (>= 2.19.91) + - libgnome-pilot2-dev (>= 2.0.15) + - libbonobo2-dev (>= 2.16.0) + - evolution-data-server-dev (>= 2.21.0) + - libgtk2.0-dev (>= 2.12.0) + - libnotify-dev (>= 0.3.0), + - libdbus-1-dev (>= 1.0.0) + - gtkhtml3.14 (>= 3.16.0) + and corresponding depends where necessary + * Add conflict on plugins older than source-package - -- Heikki Henriksen Tue, 13 Nov 2007 20:08:18 +0100 + -- Heikki Henriksen Tue, 13 Nov 2007 21:11:47 +0100 evolution (2.12.1-0) unstable; urgency=low diff --git a/debian/control b/debian/control index 82d5dc4572..ab635f8440 100644 --- a/debian/control +++ b/debian/control @@ -16,21 +16,21 @@ Build-Depends: debhelper (>= 5.0.0), intltool (>= 0.35.0), libtool, pkg-config, - gnome-icon-theme (>= 1.2.0), + gnome-icon-theme (>= 2.19.91), gnome-doc-utils (>= 0.3.2), libatk1.0-dev, libldap2-dev, libgtkhtml3.14-dev (>= 3.14.0), - libgnome-pilot2-dev, + libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, libnss3-dev, psmisc, libglib2.0-dev, liborbit2-dev (>= 1:2.9.8), - libbonobo2-dev, - evolution-data-server-dev (>= 1.11.92), - evolution-data-server-dev (<< 1.13.0)), - libgtk2.0-dev (>= 2.10.0), + libbonobo2-dev (>= 2.16.0), + evolution-data-server-dev (>= 2.21.0), + evolution-data-server-dev (<< 2.23.0), + libgtk2.0-dev (>= 2.12.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), libgnomeui-dev, @@ -50,11 +50,11 @@ Build-Depends: debhelper (>= 5.0.0), libebook1.2-dev (>= 1.9.4), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libnotify-dev, + libnotify-dev (>= 0.3.0), libsoup2.2-dev (>= 2.2.2), - libdbus-1-dev, + libdbus-1-dev (>= 1.0.0), libexchange-storage1.2-dev (>= 1.9.4), - gtkhtml3.14, + gtkhtml3.14 (>= 3.16.0), libgstreamer0.10-dev Standards-Version: 3.7.2 @@ -63,14 +63,14 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 1.11.92), - evolution-data-server (<< 1.13.0), - gtkhtml3.14 (>= 3.14.0), - gnome-icon-theme (>= 1.2.0), + evolution-data-server (>= 2.21.0), + evolution-data-server (<< 2.23.0), + gtkhtml3.14 (>= 3.16.0), + gnome-icon-theme (>= 2.19.91), dbus -Recommends: gnome-pilot-conduits (>= 2.0.9), +Recommends: gnome-pilot-conduits (>= 2.0.15), gnome-desktop-data, - evolution-plugins, + evolution-plugins (>= 2.21.0), yelp, bogofilter | spamassassin Suggests: bug-buddy, @@ -84,7 +84,9 @@ Provides: mail-reader, imap-client Replaces: evolution-plugins (<= 2.6.1-2), evolution-common (<< 2.6.2-3) -Conflicts: evolution-exchange (<< 2.11.90) +Conflicts: evolution-exchange (<< 2.21.0), + evolution-plugins (<< 2.21.0), + evolution-plugins-experimental (<< 2.21.0) Description: groupware suite with mail client and organizer Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. From 5c2af1e558f0df2d3668af13b8605b9598372046 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 13 Nov 2007 21:38:39 +0000 Subject: [PATCH 02/60] remove all patches applied upstream for 2.12 git-svn-id: file:///svn/pkg-evolution/unstable/evolution@912 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 9 +++- .../15_contact-list-editor-expand.patch | 12 ----- debian/patches/25_mute-debug-messages.patch | 49 ------------------- debian/patches/30_mute-alarm-notify.patch | 24 --------- .../patches/50_filter_missing_gettext.patch | 24 --------- debian/patches/50_libnssckbi-location.patch | 11 ----- .../60_new_addressbook_set_relative_url.patch | 29 ----------- 7 files changed, 8 insertions(+), 150 deletions(-) delete mode 100644 debian/patches/15_contact-list-editor-expand.patch delete mode 100644 debian/patches/25_mute-debug-messages.patch delete mode 100644 debian/patches/30_mute-alarm-notify.patch delete mode 100644 debian/patches/50_filter_missing_gettext.patch delete mode 100644 debian/patches/50_libnssckbi-location.patch delete mode 100644 debian/patches/60_new_addressbook_set_relative_url.patch diff --git a/debian/changelog b/debian/changelog index f8afdbf87e..3ba3992176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,15 @@ evolution (2.12.1-0) unstable; urgency=low * Update patch: 70_no-mail-remote-plugin.patch * Upstream fix for glade-dir (closes: #450524) * [debian/rules] Update ELIBDIR + * Remove patches applied upstream: + - 15_contact-list-editor-expand.patch + - 25_mute-debug-messages.patch + - 30_mute-alarm-notify.patch + - 50_filter_missing_gettext.patch + - 50_libnssckbi-location.patch + - 60_new_addressbook_set_relative_url.patch - -- Heikki Henriksen Tue, 13 Nov 2007 16:05:33 +0100 + -- Heikki Henriksen Tue, 13 Nov 2007 22:30:10 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/patches/15_contact-list-editor-expand.patch b/debian/patches/15_contact-list-editor-expand.patch deleted file mode 100644 index 5f2361ef4b..0000000000 --- a/debian/patches/15_contact-list-editor-expand.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN addressbook/gui/contact-list-editor.orig/contact-list-editor.glade addressbook/gui/contact-list-editor/contact-list-editor.glade ---- addressbook/gui/contact-list-editor.orig/contact-list-editor.glade 2007-04-09 15:07:42.000000000 +0200 -+++ addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-04-21 05:43:19.679247908 +0200 -@@ -258,7 +258,7 @@ - - - 0 -- True -+ False - True - - diff --git a/debian/patches/25_mute-debug-messages.patch b/debian/patches/25_mute-debug-messages.patch deleted file mode 100644 index 87ed69f2c0..0000000000 --- a/debian/patches/25_mute-debug-messages.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- plugins/caldav/caldav-source.c.orig 2007-04-23 20:23:17.931600926 +0200 -+++ plugins/caldav/caldav-source.c 2007-04-23 20:23:27.760215176 +0200 -@@ -38,6 +38,8 @@ - - #include - -+#define d(x) -+ - /*****************************************************************************/ - /* prototypes */ - int e_plugin_lib_enable (EPluginLib *ep, -@@ -84,7 +86,7 @@ - { - - if (enable) { -- g_print ("CalDAV Eplugin starting up ...\n"); -+ d (g_print ("CalDAV Eplugin starting up ...\n")); - ensure_caldav_source_group (); - } - ---- plugins/default-mailer/default-mailer.c.orig 2007-04-23 20:24:27.627956676 +0200 -+++ plugins/default-mailer/default-mailer.c 2007-04-23 20:25:36.000229676 +0200 -@@ -33,6 +33,8 @@ - #define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command" - #define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s" - -+#define d(x) -+ - void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target); - - static gboolean -@@ -46,7 +48,7 @@ - if (mailto_command == NULL) - return FALSE; - -- g_debug ("mailto URL command: %s", mailto_command); -+ d (g_debug ("mailto URL command: %s", mailto_command)); - - /* tokenize the mailto command */ - if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL)) -@@ -56,7 +58,7 @@ - - /* check the basename of the first token */ - basename = g_path_get_basename (argv[0]); -- g_debug ("mailto URL program: %s", basename); -+ d (g_debug ("mailto URL program: %s", basename)); - is_default = g_str_has_prefix (basename, "evolution"); - g_free (basename); - diff --git a/debian/patches/30_mute-alarm-notify.patch b/debian/patches/30_mute-alarm-notify.patch deleted file mode 100644 index b1d9a904ef..0000000000 --- a/debian/patches/30_mute-alarm-notify.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-notify.c ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-04-09 15:10:29.000000000 +0200 -+++ evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-notify.c 2007-05-10 19:35:05.000000000 +0200 -@@ -49,7 +49,7 @@ - EMsgPort *alarm_reply_port; - static GIOChannel *alarm_reply_channel; - --#define d(x) x -+#define d(x) - - - static void alarm_notify_class_init (AlarmNotifyClass *klass); -diff -Nur evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-queue.c ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-09 15:10:29.000000000 +0200 -+++ evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-queue.c 2007-05-10 19:35:10.000000000 +0200 -@@ -83,7 +83,7 @@ - - - --#define d(x) x -+#define d(x) - - /* The dialog with alarm nofications */ - static AlarmNotificationsDialog *alarm_notifications_dialog = NULL; diff --git a/debian/patches/50_filter_missing_gettext.patch b/debian/patches/50_filter_missing_gettext.patch deleted file mode 100644 index 5e524299f4..0000000000 --- a/debian/patches/50_filter_missing_gettext.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur evolution-2.8.1.1/filter/filter-rule.c evolution-2.8.1.1.new/filter/filter-rule.c ---- evolution-2.8.1.1/filter/filter-rule.c 2006-01-25 09:35:36.000000000 +0100 -+++ evolution-2.8.1.1.new/filter/filter-rule.c 2006-12-04 22:14:07.000000000 +0100 -@@ -806,7 +806,7 @@ - /* FIXME: do we want the following code in the future? */ - /*gtk_editable_select_region (GTK_EDITABLE (name), 0, -1);*/ - } else { -- gtk_entry_set_text (GTK_ENTRY (name), fr->name); -+ gtk_entry_set_text (GTK_ENTRY (name), _(fr->name)); - } - - /* evil kludgy hack because gtk sucks */ -diff -Nur evolution-2.8.1.1/mail/em-folder-browser.c evolution-2.8.1.1.new/mail/em-folder-browser.c ---- evolution-2.8.1.1/mail/em-folder-browser.c 2006-09-29 09:37:55.000000000 +0200 -+++ evolution-2.8.1.1.new/mail/em-folder-browser.c 2006-12-04 22:14:07.000000000 +0100 -@@ -716,7 +716,7 @@ - char *name, *text; - - text = e_search_bar_get_text(esb); -- name = g_strdup_printf("%s %s", rule->name, (text&&text[0])?text:"''"); -+ name = g_strdup_printf("%s %s", _(rule->name), (text&&text[0])?text:_("''")); - g_free (text); - filter_rule_set_name(rule, name); - g_free (name); diff --git a/debian/patches/50_libnssckbi-location.patch b/debian/patches/50_libnssckbi-location.patch deleted file mode 100644 index 3784f74da0..0000000000 --- a/debian/patches/50_libnssckbi-location.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur evolution-2.6.3/smime/lib/e-cert-db.c evolution-2.6.3.new/smime/lib/e-cert-db.c ---- evolution-2.6.3/smime/lib/e-cert-db.c 2006-07-04 06:11:05.000000000 +0200 -+++ evolution-2.6.3.new/smime/lib/e-cert-db.c 2007-03-11 01:32:42.000000000 +0100 -@@ -290,6 +290,7 @@ - MOZILLA_NSS_LIB_DIR, - #endif - "/usr/lib", -+ "/usr/lib/xulrunner", - "/usr/lib/mozilla", - "/opt/mozilla/lib", - "/opt/mozilla/lib/mozilla" diff --git a/debian/patches/60_new_addressbook_set_relative_url.patch b/debian/patches/60_new_addressbook_set_relative_url.patch deleted file mode 100644 index 7b85aeddff..0000000000 --- a/debian/patches/60_new_addressbook_set_relative_url.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- evolution-2.6.1.orig/addressbook/gui/widgets/eab-config.c 2005-01-31 22:59:17.000000000 +0100 -+++ evolution-2.6.1/addressbook/gui/widgets/eab-config.c 2006-05-08 01:30:57.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #endif - -+#include - #include "eab-config.h" - - static GObjectClass *ecp_parent_class; -@@ -136,6 +137,18 @@ - eab_config_target_new_source (EABConfig *ecp, struct _ESource *source) - { - EABConfigTargetSource *t = e_config_target_new (&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t)); -+ char *uri_text; -+ const char *relative_uri; -+ -+ /* For local sources, use uid as relative_uri */ -+ uri_text = e_source_get_uri (source); -+ if (!strncmp (uri_text, "file", 4)) { -+ relative_uri = e_source_peek_relative_uri (source); -+ if (!relative_uri || !*relative_uri) { -+ e_source_set_relative_uri (source, e_source_peek_uid (source)); -+ } -+ } -+ g_free (uri_text); - - t->source = source; - g_object_ref (source); From 042a082b751697afaec50b5e2fe5e721088d7c63 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 13 Nov 2007 21:43:10 +0000 Subject: [PATCH 03/60] pull in patch-review changes from unstable-branch remove applied patch 70_no-mail-remote-plugin.patch git-svn-id: file:///svn/pkg-evolution/experimental/evolution@913 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 13 ++++- .../15_contact-list-editor-expand.patch | 12 ----- debian/patches/25_mute-debug-messages.patch | 49 ------------------- debian/patches/30_mute-alarm-notify.patch | 24 --------- .../patches/50_filter_missing_gettext.patch | 24 --------- debian/patches/50_libnssckbi-location.patch | 11 ----- .../60_new_addressbook_set_relative_url.patch | 29 ----------- debian/patches/70_no-mail-remote-plugin.patch | 49 ------------------- 8 files changed, 12 insertions(+), 199 deletions(-) delete mode 100644 debian/patches/15_contact-list-editor-expand.patch delete mode 100644 debian/patches/25_mute-debug-messages.patch delete mode 100644 debian/patches/30_mute-alarm-notify.patch delete mode 100644 debian/patches/50_filter_missing_gettext.patch delete mode 100644 debian/patches/50_libnssckbi-location.patch delete mode 100644 debian/patches/60_new_addressbook_set_relative_url.patch delete mode 100644 debian/patches/70_no-mail-remote-plugin.patch diff --git a/debian/changelog b/debian/changelog index 0476a4688c..ca2c543677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ evolution (2.21.2-0) experimental; urgency=low - gtkhtml3.14 (>= 3.16.0) and corresponding depends where necessary * Add conflict on plugins older than source-package + * Remove patch applied upstread: + - 70_no-mail-remote-plugin.patch -- Heikki Henriksen Tue, 13 Nov 2007 21:11:47 +0100 @@ -25,8 +27,17 @@ evolution (2.12.1-0) unstable; urgency=low * Update patch: 70_no-mail-remote-plugin.patch * Upstream fix for glade-dir (closes: #450524) * [debian/rules] Update ELIBDIR + * Remove patches applied upstream: + - 15_contact-list-editor-expand.patch + - 25_mute-debug-messages.patch + - 30_mute-alarm-notify.patch + - 50_filter_missing_gettext.patch + - 50_libnssckbi-location.patch + - 60_new_addressbook_set_relative_url.patch + + -- Heikki Henriksen Tue, 13 Nov 2007 22:30:10 +0100 + - -- Heikki Henriksen Tue, 13 Nov 2007 16:05:33 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/patches/15_contact-list-editor-expand.patch b/debian/patches/15_contact-list-editor-expand.patch deleted file mode 100644 index 5f2361ef4b..0000000000 --- a/debian/patches/15_contact-list-editor-expand.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN addressbook/gui/contact-list-editor.orig/contact-list-editor.glade addressbook/gui/contact-list-editor/contact-list-editor.glade ---- addressbook/gui/contact-list-editor.orig/contact-list-editor.glade 2007-04-09 15:07:42.000000000 +0200 -+++ addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-04-21 05:43:19.679247908 +0200 -@@ -258,7 +258,7 @@ - - - 0 -- True -+ False - True - - diff --git a/debian/patches/25_mute-debug-messages.patch b/debian/patches/25_mute-debug-messages.patch deleted file mode 100644 index 87ed69f2c0..0000000000 --- a/debian/patches/25_mute-debug-messages.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- plugins/caldav/caldav-source.c.orig 2007-04-23 20:23:17.931600926 +0200 -+++ plugins/caldav/caldav-source.c 2007-04-23 20:23:27.760215176 +0200 -@@ -38,6 +38,8 @@ - - #include - -+#define d(x) -+ - /*****************************************************************************/ - /* prototypes */ - int e_plugin_lib_enable (EPluginLib *ep, -@@ -84,7 +86,7 @@ - { - - if (enable) { -- g_print ("CalDAV Eplugin starting up ...\n"); -+ d (g_print ("CalDAV Eplugin starting up ...\n")); - ensure_caldav_source_group (); - } - ---- plugins/default-mailer/default-mailer.c.orig 2007-04-23 20:24:27.627956676 +0200 -+++ plugins/default-mailer/default-mailer.c 2007-04-23 20:25:36.000229676 +0200 -@@ -33,6 +33,8 @@ - #define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command" - #define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s" - -+#define d(x) -+ - void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target); - - static gboolean -@@ -46,7 +48,7 @@ - if (mailto_command == NULL) - return FALSE; - -- g_debug ("mailto URL command: %s", mailto_command); -+ d (g_debug ("mailto URL command: %s", mailto_command)); - - /* tokenize the mailto command */ - if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL)) -@@ -56,7 +58,7 @@ - - /* check the basename of the first token */ - basename = g_path_get_basename (argv[0]); -- g_debug ("mailto URL program: %s", basename); -+ d (g_debug ("mailto URL program: %s", basename)); - is_default = g_str_has_prefix (basename, "evolution"); - g_free (basename); - diff --git a/debian/patches/30_mute-alarm-notify.patch b/debian/patches/30_mute-alarm-notify.patch deleted file mode 100644 index b1d9a904ef..0000000000 --- a/debian/patches/30_mute-alarm-notify.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-notify.c ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-04-09 15:10:29.000000000 +0200 -+++ evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-notify.c 2007-05-10 19:35:05.000000000 +0200 -@@ -49,7 +49,7 @@ - EMsgPort *alarm_reply_port; - static GIOChannel *alarm_reply_channel; - --#define d(x) x -+#define d(x) - - - static void alarm_notify_class_init (AlarmNotifyClass *klass); -diff -Nur evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-queue.c ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-09 15:10:29.000000000 +0200 -+++ evolution-2.10.1.new/calendar/gui/alarm-notify/alarm-queue.c 2007-05-10 19:35:10.000000000 +0200 -@@ -83,7 +83,7 @@ - - - --#define d(x) x -+#define d(x) - - /* The dialog with alarm nofications */ - static AlarmNotificationsDialog *alarm_notifications_dialog = NULL; diff --git a/debian/patches/50_filter_missing_gettext.patch b/debian/patches/50_filter_missing_gettext.patch deleted file mode 100644 index 5e524299f4..0000000000 --- a/debian/patches/50_filter_missing_gettext.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur evolution-2.8.1.1/filter/filter-rule.c evolution-2.8.1.1.new/filter/filter-rule.c ---- evolution-2.8.1.1/filter/filter-rule.c 2006-01-25 09:35:36.000000000 +0100 -+++ evolution-2.8.1.1.new/filter/filter-rule.c 2006-12-04 22:14:07.000000000 +0100 -@@ -806,7 +806,7 @@ - /* FIXME: do we want the following code in the future? */ - /*gtk_editable_select_region (GTK_EDITABLE (name), 0, -1);*/ - } else { -- gtk_entry_set_text (GTK_ENTRY (name), fr->name); -+ gtk_entry_set_text (GTK_ENTRY (name), _(fr->name)); - } - - /* evil kludgy hack because gtk sucks */ -diff -Nur evolution-2.8.1.1/mail/em-folder-browser.c evolution-2.8.1.1.new/mail/em-folder-browser.c ---- evolution-2.8.1.1/mail/em-folder-browser.c 2006-09-29 09:37:55.000000000 +0200 -+++ evolution-2.8.1.1.new/mail/em-folder-browser.c 2006-12-04 22:14:07.000000000 +0100 -@@ -716,7 +716,7 @@ - char *name, *text; - - text = e_search_bar_get_text(esb); -- name = g_strdup_printf("%s %s", rule->name, (text&&text[0])?text:"''"); -+ name = g_strdup_printf("%s %s", _(rule->name), (text&&text[0])?text:_("''")); - g_free (text); - filter_rule_set_name(rule, name); - g_free (name); diff --git a/debian/patches/50_libnssckbi-location.patch b/debian/patches/50_libnssckbi-location.patch deleted file mode 100644 index 3784f74da0..0000000000 --- a/debian/patches/50_libnssckbi-location.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur evolution-2.6.3/smime/lib/e-cert-db.c evolution-2.6.3.new/smime/lib/e-cert-db.c ---- evolution-2.6.3/smime/lib/e-cert-db.c 2006-07-04 06:11:05.000000000 +0200 -+++ evolution-2.6.3.new/smime/lib/e-cert-db.c 2007-03-11 01:32:42.000000000 +0100 -@@ -290,6 +290,7 @@ - MOZILLA_NSS_LIB_DIR, - #endif - "/usr/lib", -+ "/usr/lib/xulrunner", - "/usr/lib/mozilla", - "/opt/mozilla/lib", - "/opt/mozilla/lib/mozilla" diff --git a/debian/patches/60_new_addressbook_set_relative_url.patch b/debian/patches/60_new_addressbook_set_relative_url.patch deleted file mode 100644 index 7b85aeddff..0000000000 --- a/debian/patches/60_new_addressbook_set_relative_url.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- evolution-2.6.1.orig/addressbook/gui/widgets/eab-config.c 2005-01-31 22:59:17.000000000 +0100 -+++ evolution-2.6.1/addressbook/gui/widgets/eab-config.c 2006-05-08 01:30:57.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #endif - -+#include - #include "eab-config.h" - - static GObjectClass *ecp_parent_class; -@@ -136,6 +137,18 @@ - eab_config_target_new_source (EABConfig *ecp, struct _ESource *source) - { - EABConfigTargetSource *t = e_config_target_new (&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t)); -+ char *uri_text; -+ const char *relative_uri; -+ -+ /* For local sources, use uid as relative_uri */ -+ uri_text = e_source_get_uri (source); -+ if (!strncmp (uri_text, "file", 4)) { -+ relative_uri = e_source_peek_relative_uri (source); -+ if (!relative_uri || !*relative_uri) { -+ e_source_set_relative_uri (source, e_source_peek_uid (source)); -+ } -+ } -+ g_free (uri_text); - - t->source = source; - g_object_ref (source); diff --git a/debian/patches/70_no-mail-remote-plugin.patch b/debian/patches/70_no-mail-remote-plugin.patch deleted file mode 100644 index d3c8644d5c..0000000000 --- a/debian/patches/70_no-mail-remote-plugin.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru evolution-2.12.1.orig/configure evolution-2.12.1/configure ---- evolution-2.12.1.orig/configure 2007-11-13 15:12:10.000000000 +0100 -+++ evolution-2.12.1/configure 2007-11-13 15:13:08.000000000 +0100 -@@ -38032,7 +38032,7 @@ - plugins_standard="$plugins_standard_always" - all_plugins_standard="$plugins_standard" - --plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments" -+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments" - plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS" - all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" - -@@ -38795,7 +38795,7 @@ - EVOLUTION_DIR=`(cd $srcdir; pwd)` - - --ac_config_files="$ac_config_files po/Makefile.in Makefile win32/Makefile a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile a11y/e-table/Makefile a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/widgets/Makefile addressbook/importers/Makefile addressbook/printing/Makefile addressbook/tools/Makefile addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile data/cde_app_root/dt/appconfig/Makefile data/cde_app_root/dt/appconfig/appmanager/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile data/cde_app_root/dt/appconfig/icons/Makefile data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt e-util/Makefile filter/Makefile help/Makefile help/quickref/Makefile help/quickref/C/Makefile help/quickref/de/Makefile help/quickref/es/Makefile help/quickref/it/Makefile help/quickref/fr/Makefile help/quickref/pl/Makefile help/quickref/pt/Makefile help/quickref/sv/Makefile help/quickref/sq/Makefile shell/Makefile shell/evolution-nognome ui/Makefile views/Makefile views/addressbook/Makefile views/calendar/Makefile views/mail/Makefile views/tasks/Makefile views/memos/Makefile widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile calendar/idl/Makefile calendar/conduits/Makefile calendar/conduits/common/Makefile calendar/conduits/todo/Makefile calendar/conduits/calendar/Makefile calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/default/de/Makefile mail/default/es/Makefile mail/default/fi/Makefile mail/default/fr/Makefile mail/default/lt/Makefile mail/default/mk/Makefile mail/default/zh_CN/Makefile mail/default/ja/Makefile mail/default/nl/Makefile mail/default/pl/Makefile mail/default/pt/Makefile mail/default/sv/Makefile mail/importers/Makefile plugins/Makefile plugins/mark-all-read/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile plugins/plugin-manager/Makefile plugins/bbdb/Makefile plugins/audio-inline/Makefile plugins/attachment-reminder/Makefile plugins/mail-notification/Makefile plugins/mail-to-meeting/Makefile plugins/mail-to-task/Makefile plugins/mail-remote/Makefile plugins/mono/Makefile plugins/new-mail-notify/Makefile plugins/subject-thread/Makefile plugins/save-attachments/Makefile plugins/save-calendar/Makefile plugins/select-one-source/Makefile plugins/mark-calendar-offline/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/copy-tool/Makefile plugins/folder-unsubscribe/Makefile plugins/mailing-list-actions/Makefile plugins/itip-formatter/Makefile plugins/backup-restore/Makefile plugins/exchange-operations/Makefile plugins/default-source/Makefile plugins/default-mailer/Makefile plugins/addressbook-file/Makefile plugins/startup-wizard/Makefile plugins/print-message/Makefile plugins/groupwise-account-setup/Makefile plugins/hula-account-setup/Makefile plugins/groupwise-features/Makefile plugins/mail-account-disable/Makefile plugins/sa-junk-plugin/Makefile plugins/bogo-junk-plugin/Makefile plugins/ipod-sync/Makefile plugins/publish-calendar/Makefile plugins/import-ics-attachments/Makefile plugins/imap-features/Makefile plugins/tnef-attachments/Makefile plugins/face/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile tools/Makefile evolution-zip evolution-shell.pc evolution-plugin.pc" -+ac_config_files="$ac_config_files po/Makefile.in Makefile win32/Makefile a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile a11y/e-table/Makefile a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/widgets/Makefile addressbook/importers/Makefile addressbook/printing/Makefile addressbook/tools/Makefile addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile data/cde_app_root/dt/appconfig/Makefile data/cde_app_root/dt/appconfig/appmanager/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile data/cde_app_root/dt/appconfig/icons/Makefile data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt e-util/Makefile filter/Makefile help/Makefile help/quickref/Makefile help/quickref/C/Makefile help/quickref/de/Makefile help/quickref/es/Makefile help/quickref/it/Makefile help/quickref/fr/Makefile help/quickref/pl/Makefile help/quickref/pt/Makefile help/quickref/sv/Makefile help/quickref/sq/Makefile shell/Makefile shell/evolution-nognome ui/Makefile views/Makefile views/addressbook/Makefile views/calendar/Makefile views/mail/Makefile views/tasks/Makefile views/memos/Makefile widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile calendar/idl/Makefile calendar/conduits/Makefile calendar/conduits/common/Makefile calendar/conduits/todo/Makefile calendar/conduits/calendar/Makefile calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/default/de/Makefile mail/default/es/Makefile mail/default/fi/Makefile mail/default/fr/Makefile mail/default/lt/Makefile mail/default/mk/Makefile mail/default/zh_CN/Makefile mail/default/ja/Makefile mail/default/nl/Makefile mail/default/pl/Makefile mail/default/pt/Makefile mail/default/sv/Makefile mail/importers/Makefile plugins/Makefile plugins/mark-all-read/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile plugins/plugin-manager/Makefile plugins/bbdb/Makefile plugins/audio-inline/Makefile plugins/attachment-reminder/Makefile plugins/mail-notification/Makefile plugins/mail-to-meeting/Makefile plugins/mail-to-task/Makefile plugins/mono/Makefile plugins/new-mail-notify/Makefile plugins/subject-thread/Makefile plugins/save-attachments/Makefile plugins/save-calendar/Makefile plugins/select-one-source/Makefile plugins/mark-calendar-offline/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/copy-tool/Makefile plugins/folder-unsubscribe/Makefile plugins/mailing-list-actions/Makefile plugins/itip-formatter/Makefile plugins/backup-restore/Makefile plugins/exchange-operations/Makefile plugins/default-source/Makefile plugins/default-mailer/Makefile plugins/addressbook-file/Makefile plugins/startup-wizard/Makefile plugins/print-message/Makefile plugins/groupwise-account-setup/Makefile plugins/hula-account-setup/Makefile plugins/groupwise-features/Makefile plugins/mail-account-disable/Makefile plugins/sa-junk-plugin/Makefile plugins/bogo-junk-plugin/Makefile plugins/ipod-sync/Makefile plugins/publish-calendar/Makefile plugins/import-ics-attachments/Makefile plugins/imap-features/Makefile plugins/tnef-attachments/Makefile plugins/face/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile tools/Makefile evolution-zip evolution-shell.pc evolution-plugin.pc" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -39680,7 +39680,6 @@ - "plugins/mail-notification/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-notification/Makefile" ;; - "plugins/mail-to-meeting/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-to-meeting/Makefile" ;; - "plugins/mail-to-task/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-to-task/Makefile" ;; -- "plugins/mail-remote/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-remote/Makefile" ;; - "plugins/mono/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mono/Makefile" ;; - "plugins/new-mail-notify/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/new-mail-notify/Makefile" ;; - "plugins/subject-thread/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/subject-thread/Makefile" ;; -diff -ru evolution-2.12.1.orig/configure.in evolution-2.12.1/configure.in ---- evolution-2.12.1.orig/configure.in 2007-11-13 15:12:16.000000000 +0100 -+++ evolution-2.12.1/configure.in 2007-11-13 15:13:18.000000000 +0100 -@@ -1700,7 +1700,7 @@ - plugins_standard="$plugins_standard_always" - all_plugins_standard="$plugins_standard" - --plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments" -+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments" - plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS" - all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" - -@@ -2009,7 +2009,6 @@ - plugins/mail-notification/Makefile - plugins/mail-to-meeting/Makefile - plugins/mail-to-task/Makefile --plugins/mail-remote/Makefile - plugins/mono/Makefile - plugins/new-mail-notify/Makefile - plugins/subject-thread/Makefile From 7a65d7f5dd332ebefad49f73583286b3eaf226bc Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 13 Nov 2007 21:45:23 +0000 Subject: [PATCH 04/60] update version in desktop-file git-svn-id: file:///svn/pkg-evolution/experimental/evolution@914 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/evolution-mail.desktop | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca2c543677..89d2a89d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ evolution (2.21.2-0) experimental; urgency=low * Add conflict on plugins older than source-package * Remove patch applied upstread: - 70_no-mail-remote-plugin.patch + * Update version in desktop-file - -- Heikki Henriksen Tue, 13 Nov 2007 21:11:47 +0100 + -- Heikki Henriksen Tue, 13 Nov 2007 22:44:49 +0100 evolution (2.12.1-0) unstable; urgency=low diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index 5840395635..de47b705d3 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -43,5 +43,5 @@ StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution X-GNOME-Bugzilla-Component=Miscellaneous -X-GNOME-Bugzilla-Version=2.10.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.10;evolution-alarm-notify; +X-GNOME-Bugzilla-Version=2.22.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify; From 52229949df2115b95856a28d9a4b64befbbd1e4e Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 13 Nov 2007 22:16:22 +0000 Subject: [PATCH 05/60] evo 2.21: update base-version and ELIBDIR git-svn-id: file:///svn/pkg-evolution/experimental/evolution@915 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 +++- debian/evolution-plugins-experimental.install | 2 +- debian/evolution-plugins.install | 2 +- debian/evolution.install | 20 +++++++++---------- debian/rules | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89d2a89d0c..4f3cd00ad5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,10 @@ evolution (2.21.2-0) experimental; urgency=low * Remove patch applied upstread: - 70_no-mail-remote-plugin.patch * Update version in desktop-file + * Update base-version to 2.22 in *.install + * Update ELIBDIR in rules - -- Heikki Henriksen Tue, 13 Nov 2007 22:44:49 +0100 + -- Heikki Henriksen Tue, 13 Nov 2007 23:15:03 +0100 evolution (2.12.1-0) unstable; urgency=low diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 7025dcec07..8a4ed07790 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1 @@ -debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.22/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync}*.{so,eplug,xml,glade} diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index af684836cb..0eeae60e45 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/evolution/2.12/plugins/*{attachment-reminder,audio-inline,bbdb,bogo-junk-plugin,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,new-mail-notify,default-mailer,mail-attachments-import-ics,prefer-plain}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,bogo-junk-plugin,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,new-mail-notify,default-mailer,mail-attachments-import-ics,prefer-plain}*.{so,eplug,xml,glade} debian/lintian/evolution-plugins usr/share/lintian/overrides/ diff --git a/debian/evolution.install b/debian/evolution.install index 179ddb36af..68e7e6c4aa 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -1,16 +1,16 @@ debian/tmp/etc/gconf -debian/tmp/usr/lib/evolution/2.12/*.so.* -debian/tmp/usr/lib/evolution/2.12/components/*.so -debian/tmp/usr/lib/evolution/2.12/conduits/*.so -debian/tmp/usr/lib/evolution/2.12/csv2vcard -debian/tmp/usr/lib/evolution/2.12/killev -debian/tmp/usr/lib/evolution/2.12/evolution-addressbook-export -debian/tmp/usr/lib/evolution/2.12/evolution-addressbook-clean -debian/tmp/usr/lib/evolution/2.12/evolution-alarm-notify -debian/tmp/usr/lib/evolution/2.12/evolution-backup +debian/tmp/usr/lib/evolution/2.22/*.so.* +debian/tmp/usr/lib/evolution/2.22/components/*.so +debian/tmp/usr/lib/evolution/2.22/conduits/*.so +debian/tmp/usr/lib/evolution/2.22/csv2vcard +debian/tmp/usr/lib/evolution/2.22/killev +debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-export +debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-clean +debian/tmp/usr/lib/evolution/2.22/evolution-alarm-notify +debian/tmp/usr/lib/evolution/2.22/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.so +debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.so debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ diff --git a/debian/rules b/debian/rules index 4793fcf382..d17a70966a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --nos DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts -ELIBDIR := usr/lib/evolution/2.12 +ELIBDIR := usr/lib/evolution/2.22 CFLAGS += -fPIC From 1a061f188b81129f9dcde2eada652f24fb8d2b98 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Wed, 14 Nov 2007 22:28:45 +0000 Subject: [PATCH 06/60] Add depends on -dbg for the experimental branch git-svn-id: file:///svn/pkg-evolution/experimental/evolution@916 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f3cd00ad5..528fe6253c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,9 @@ evolution (2.21.2-0) experimental; urgency=low * Update version in desktop-file * Update base-version to 2.22 in *.install * Update ELIBDIR in rules + * Add depend on -dbg for the experimental branch - -- Heikki Henriksen Tue, 13 Nov 2007 23:15:03 +0100 + -- Heikki Henriksen Wed, 14 Nov 2007 23:27:32 +0100 evolution (2.12.1-0) unstable; urgency=low diff --git a/debian/control b/debian/control index ab635f8440..42f4983474 100644 --- a/debian/control +++ b/debian/control @@ -62,6 +62,7 @@ Package: evolution Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + evolution-dbg (= ${binary:Version}), evolution-common (= ${source:Version}), evolution-data-server (>= 2.21.0), evolution-data-server (<< 2.23.0), @@ -77,8 +78,7 @@ Suggests: bug-buddy, gnupg, gnome-spell (>= 1.0.4), network-manager, - evolution-exchange, - evolution-dbg, + evolution-exchange (>= 2.21.0), evolution-plugins-experimental Provides: mail-reader, imap-client From aacafea8c0f7bf2c6376869eb09cc2f6b0690860 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Wed, 21 Nov 2007 13:01:39 +0000 Subject: [PATCH 07/60] * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control git-svn-id: file:///svn/pkg-evolution/unstable/evolution@917 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/control | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ba3992176..498351de30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ evolution (2.12.1-0) unstable; urgency=low - 50_filter_missing_gettext.patch - 50_libnssckbi-location.patch - 60_new_addressbook_set_relative_url.patch + * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control - -- Heikki Henriksen Tue, 13 Nov 2007 22:30:10 +0100 + -- Heikki Henriksen Wed, 21 Nov 2007 13:55:38 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 82d5dc4572..f07d90b6c9 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,11 @@ Uploaders: Jordi Mallach , Loic Minier , Heikki Henriksen , Oystein Gisnas +Standards-Version: 3.7.2 +Dm-Upload-Allowed: yes +Homepage: http://www.gnome.org/projects/evolution/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution +Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.37), dpkg-dev (>= 1.3.19), @@ -56,7 +61,6 @@ Build-Depends: debhelper (>= 5.0.0), libexchange-storage1.2-dev (>= 1.9.4), gtkhtml3.14, libgstreamer0.10-dev -Standards-Version: 3.7.2 Package: evolution Architecture: any From 81c4183855d102202f4da6cdbc5508af517a951a Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sun, 25 Nov 2007 17:11:35 +0000 Subject: [PATCH 08/60] fix syntax in build-depends git-svn-id: file:///svn/pkg-evolution/unstable/evolution@919 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f07d90b6c9..96c8182893 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends: debhelper (>= 5.0.0), liborbit2-dev (>= 1:2.9.8), libbonobo2-dev, evolution-data-server-dev (>= 1.11.92), - evolution-data-server-dev (<< 1.13.0)), + evolution-data-server-dev (<< 1.13.0), libgtk2.0-dev (>= 2.10.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), From f87ade3197e26f4a9b900c4f646c62cacb6e9c07 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sun, 25 Nov 2007 21:04:14 +0000 Subject: [PATCH 09/60] + Add build-dep on libytnef0-dev for experimental plugin tnef-attachments + Add tnef-attachments to plugins-experimental + Add build-dep on gtk-doc-tools to build gtk-doc development documentation git-svn-id: file:///svn/pkg-evolution/unstable/evolution@920 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 5 ++++- debian/control | 4 +++- debian/evolution-plugins-experimental.install | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 498351de30..46cfddcbaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,11 @@ evolution (2.12.1-0) unstable; urgency=low - 50_libnssckbi-location.patch - 60_new_addressbook_set_relative_url.patch * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control + * Add build-dep on libytnef0-dev for experimental plugin tnef-attachments + * Add tnef-attachments to plugins-experimental + * Add build-dep on gtk-doc-tools to build gtk-doc development documentation - -- Heikki Henriksen Wed, 21 Nov 2007 13:55:38 +0100 + -- Heikki Henriksen Sun, 25 Nov 2007 20:56:09 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 96c8182893..1b58b5b57f 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, gnome-icon-theme (>= 1.2.0), gnome-doc-utils (>= 0.3.2), + gtk-doc-tools (>= 0.6), libatk1.0-dev, libldap2-dev, libgtkhtml3.14-dev (>= 3.14.0), @@ -60,7 +61,8 @@ Build-Depends: debhelper (>= 5.0.0), libdbus-1-dev, libexchange-storage1.2-dev (>= 1.9.4), gtkhtml3.14, - libgstreamer0.10-dev + libgstreamer0.10-dev, + libytnef0-dev Package: evolution Architecture: any diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 7025dcec07..81660b775f 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1 @@ -debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync,tnef-attachments}*.{so,eplug,xml,glade} From 03f5eb7c80c0ba74b90701c6c59b5209055ab0b1 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 26 Nov 2007 15:14:24 +0000 Subject: [PATCH 10/60] New upstream release git-svn-id: file:///svn/pkg-evolution/unstable/evolution@924 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 +++--- debian/control | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46cfddcbaf..1cd66a9bcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -evolution (2.12.1-0) unstable; urgency=low +evolution (2.12.2-1) unstable; urgency=low - * New upstream release + * New upstream release (bugfixes and translations) * Swap bogofilter and spamassassin recommmends, since bogofilter is quite lightweight (closes: #435635) * Versioned build-dependency on eds-dev and dependency on eds (closes: @@ -20,7 +20,7 @@ evolution (2.12.1-0) unstable; urgency=low * Add tnef-attachments to plugins-experimental * Add build-dep on gtk-doc-tools to build gtk-doc development documentation - -- Heikki Henriksen Sun, 25 Nov 2007 20:56:09 +0100 + -- Heikki Henriksen Mon, 26 Nov 2007 16:13:34 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 1b58b5b57f..80fee92630 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 5.0.0), bison, intltool (>= 0.35.0), libtool, - pkg-config, + pkg-config (>= 0.16.0), gnome-icon-theme (>= 1.2.0), gnome-doc-utils (>= 0.3.2), gtk-doc-tools (>= 0.6), From a7439bc1fec40c339506adc2d42b41f0d2c94053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Mon, 26 Nov 2007 20:47:33 +0000 Subject: [PATCH 11/60] * New upstream release (bugfixes and translations) (closes: #446890) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@927 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1cd66a9bcd..0dd5f3213b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ evolution (2.12.2-1) unstable; urgency=low - * New upstream release (bugfixes and translations) + * New upstream release (bugfixes and translations) (closes: #446890) * Swap bogofilter and spamassassin recommmends, since bogofilter is quite lightweight (closes: #435635) * Versioned build-dependency on eds-dev and dependency on eds (closes: From d03ad84027114d39b2009437123478f8bb63e70c Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 26 Nov 2007 21:01:57 +0000 Subject: [PATCH 12/60] remove --disable-gtk-doc git-svn-id: file:///svn/pkg-evolution/unstable/evolution@928 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/rules | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0dd5f3213b..437e2b4c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,9 @@ evolution (2.12.2-1) unstable; urgency=low * Add build-dep on libytnef0-dev for experimental plugin tnef-attachments * Add tnef-attachments to plugins-experimental * Add build-dep on gtk-doc-tools to build gtk-doc development documentation + * Enable building of gtk-doc in rules - -- Heikki Henriksen Mon, 26 Nov 2007 16:13:34 +0100 + -- Heikki Henriksen Mon, 26 Nov 2007 22:01:11 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 4793fcf382..87ccee7c2e 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --enable-nls \ --without-openssl-includes \ --without-openssl-libs \ - --disable-gtk-doc \ --enable-pilot-conduits \ --enable-cairo-calendar \ --enable-exchange=yes \ From e297a5efc553089ca89a87f33e4f5264b0031193 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 27 Nov 2007 08:53:31 +0000 Subject: [PATCH 13/60] prefix DM-upload-Allowed with XS to get it into the .dsc git-svn-id: file:///svn/pkg-evolution/unstable/evolution@929 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 80fee92630..208a4c6991 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Jordi Mallach , Heikki Henriksen , Oystein Gisnas Standards-Version: 3.7.2 -Dm-Upload-Allowed: yes +XS-Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution From a73933a8d6c228bdb00d17d32794c8271f10fc5d Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 27 Nov 2007 13:05:49 +0000 Subject: [PATCH 14/60] make sure eplug and xmls are included. glade-files are in GLADE_DIR: /usr/share/evolution/2.12/glade/ attachment-reminder in evolution-plugins needs to be patched to follow this policy. git-svn-id: file:///svn/pkg-evolution/unstable/evolution@930 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/evolution-plugins-experimental.install | 2 +- debian/evolution.install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 81660b775f..7a571980a4 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1 @@ -debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync,tnef-attachments}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync,tnef-attachments}*.{so,eplug,xml} diff --git a/debian/evolution.install b/debian/evolution.install index 179ddb36af..031729b992 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -10,7 +10,7 @@ debian/tmp/usr/lib/evolution/2.12/evolution-alarm-notify debian/tmp/usr/lib/evolution/2.12/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.so +debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{eplug,xml,so} debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ From eff836aa537699be7b2168d15b43a410eed2eeee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Tue, 27 Nov 2007 16:42:25 +0000 Subject: [PATCH 15/60] Revert to including all plugin files git-svn-id: file:///svn/pkg-evolution/unstable/evolution@931 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/evolution.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/evolution.install b/debian/evolution.install index 031729b992..e1c7303f55 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -10,7 +10,7 @@ debian/tmp/usr/lib/evolution/2.12/evolution-alarm-notify debian/tmp/usr/lib/evolution/2.12/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{eplug,xml,so} +debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ From 4e008d0a727f52392b4401fe3a5a0a70aef9d3c4 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 3 Dec 2007 14:16:37 +0000 Subject: [PATCH 16/60] update lintian overrides (versionbumps in some rpaths); update evolution-mail.desktop; move som more stuff to -common git-svn-id: file:///svn/pkg-evolution/unstable/evolution@932 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 5 ++++- debian/evolution-common.install | 4 ++++ debian/evolution-mail.desktop | 6 +++--- debian/evolution.install | 2 -- debian/lintian/evolution | 9 +++++---- debian/lintian/evolution-plugins | 3 ++- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 437e2b4c4d..3d4e7b41e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,11 @@ evolution (2.12.2-1) unstable; urgency=low * Add tnef-attachments to plugins-experimental * Add build-dep on gtk-doc-tools to build gtk-doc development documentation * Enable building of gtk-doc in rules + * Update lintian overrides (version-bumps in rpaths) + * Update evolution-mail.desktop + * Move menu, *.desktop & man-pages to evolution-common - -- Heikki Henriksen Mon, 26 Nov 2007 22:01:11 +0100 + -- Heikki Henriksen Mon, 03 Dec 2007 15:15:11 +0100 evolution (2.12.0-2) unstable; urgency=low diff --git a/debian/evolution-common.install b/debian/evolution-common.install index 9073c1df02..36f3879a9a 100644 --- a/debian/evolution-common.install +++ b/debian/evolution-common.install @@ -6,3 +6,7 @@ debian/tmp/usr/share/icons/hicolor debian/tmp/usr/share/locale debian/tmp/usr/share/gnome debian/tmp/usr/share/omf +debian/tmp/usr/share/menu +debian/tmp/usr/share/man +debian/evolution-mail.desktop usr/share/applications/ +debian/evolution.xpm usr/share/pixmaps/ diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index 5840395635..379b87afa0 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -38,10 +38,10 @@ Exec=evolution --component=mail Icon=evolution Terminal=false Type=Application -Categories=GNOME;Application;Network; +Categories=GNOME;Network; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution X-GNOME-Bugzilla-Component=Miscellaneous -X-GNOME-Bugzilla-Version=2.10.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.10;evolution-alarm-notify; +X-GNOME-Bugzilla-Version=2.12.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-alarm-notify; diff --git a/debian/evolution.install b/debian/evolution.install index e1c7303f55..72b9c6d6e6 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -11,6 +11,4 @@ debian/tmp/usr/lib/evolution/2.12/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} -debian/evolution-mail.desktop usr/share/applications/ -debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ diff --git a/debian/lintian/evolution b/debian/lintian/evolution index 8ad3975830..2b6963f6df 100644 --- a/debian/lintian/evolution +++ b/debian/lintian/evolution @@ -1,4 +1,5 @@ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libeaddress_conduit.so /usr/lib/evolution/2.10:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libecalendar_conduit.so /usr/lib/evolution/2.10:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libememo_conduit.so /usr/lib/evolution/2.10:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/conduits/libetodo_conduit.so /usr/lib/evolution/2.10:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libeaddress_conduit.so /usr/lib/evolution/2.12:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libecalendar_common_conduit.so /usr/lib/evolution/2.12:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libecalendar_conduit.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/conduits:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libememo_conduit.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/conduits:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libetodo_conduit.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/conduits:/usr/lib/ diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins index 32cf1b8612..d5d8e1c83c 100644 --- a/debian/lintian/evolution-plugins +++ b/debian/lintian/evolution-plugins @@ -1 +1,2 @@ -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.10/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.10:/usr/lib/evolution/2.10/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/plugins/liborg-gnome-face.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/components From 83efea5e91eec7168273339af42de7c2899eb821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Mon, 3 Dec 2007 17:05:06 +0000 Subject: [PATCH 17/60] Revert move evolution->evolution-common. Was moved the other way not long ago git-svn-id: file:///svn/pkg-evolution/unstable/evolution@933 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/evolution-common.install | 4 ---- debian/evolution.install | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/evolution-common.install b/debian/evolution-common.install index 36f3879a9a..9073c1df02 100644 --- a/debian/evolution-common.install +++ b/debian/evolution-common.install @@ -6,7 +6,3 @@ debian/tmp/usr/share/icons/hicolor debian/tmp/usr/share/locale debian/tmp/usr/share/gnome debian/tmp/usr/share/omf -debian/tmp/usr/share/menu -debian/tmp/usr/share/man -debian/evolution-mail.desktop usr/share/applications/ -debian/evolution.xpm usr/share/pixmaps/ diff --git a/debian/evolution.install b/debian/evolution.install index 72b9c6d6e6..e1c7303f55 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -11,4 +11,6 @@ debian/tmp/usr/lib/evolution/2.12/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} +debian/evolution-mail.desktop usr/share/applications/ +debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ From 264a986b5048bbd054af55ada643416efaf35f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Mon, 3 Dec 2007 17:07:34 +0000 Subject: [PATCH 18/60] Revert move evolution->evolution-common. Was moved the other way not long ago git-svn-id: file:///svn/pkg-evolution/unstable/evolution@934 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d4e7b41e1..4b715829f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ evolution (2.12.2-1) unstable; urgency=low + [ Heikki Henriksen ] * New upstream release (bugfixes and translations) (closes: #446890) * Swap bogofilter and spamassassin recommmends, since bogofilter is quite lightweight (closes: #435635) @@ -22,9 +23,8 @@ evolution (2.12.2-1) unstable; urgency=low * Enable building of gtk-doc in rules * Update lintian overrides (version-bumps in rpaths) * Update evolution-mail.desktop - * Move menu, *.desktop & man-pages to evolution-common - -- Heikki Henriksen Mon, 03 Dec 2007 15:15:11 +0100 + -- Oystein Gisnas Mon, 03 Dec 2007 18:06:48 +0100 evolution (2.12.0-2) unstable; urgency=low From 028c63c20aea3fe92a284cbd91b2044605074a2f Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Wed, 5 Dec 2007 15:52:15 +0000 Subject: [PATCH 19/60] autoreconfing \nfix automatic contacts git-svn-id: file:///svn/pkg-evolution/unstable/evolution@940 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 8 + debian/patches/05_autoreconf.patch | 119151 ++++++++++++++++++ debian/patches/75_automatic_contacts.patch | 25 + 3 files changed, 119184 insertions(+) create mode 100644 debian/patches/05_autoreconf.patch create mode 100644 debian/patches/75_automatic_contacts.patch diff --git a/debian/changelog b/debian/changelog index 4b715829f9..02c083aeff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +evolution (2.12.2-2) unstable; urgency=low + + * Add patch with autoreconfisation + - fixes lost translations (closes: #454434) + * Add patch to fix automatic contacts (closes: #454435) + + -- Heikki Henriksen Wed, 05 Dec 2007 16:33:36 +0100 + evolution (2.12.2-1) unstable; urgency=low [ Heikki Henriksen ] diff --git a/debian/patches/05_autoreconf.patch b/debian/patches/05_autoreconf.patch new file mode 100644 index 0000000000..6c62207143 --- /dev/null +++ b/debian/patches/05_autoreconf.patch @@ -0,0 +1,119151 @@ +diff -ruN evolution-2.12.2.orig/a11y/addressbook/Makefile.in evolution-2.12.2/a11y/addressbook/Makefile.in +--- evolution-2.12.2.orig/a11y/addressbook/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/a11y/addressbook/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = a11y/addressbook +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_addressbook_a11y_la_DEPENDENCIES = \ +- $(WIN32_BOOTSTRAP_LIBS) $(am__DEPENDENCIES_1) +-am_libevolution_addressbook_a11y_la_OBJECTS = ea-minicard.lo \ +- ea-minicard-view.lo ea-addressbook-view.lo ea-addressbook.lo +-libevolution_addressbook_a11y_la_OBJECTS = \ +- $(am_libevolution_addressbook_a11y_la_OBJECTS) +-libevolution_addressbook_a11y_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_addressbook_a11y_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) +-DIST_SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,17 +384,16 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la + ++ + privsolib_LTLIBRARIES = libevolution-addressbook-a11y.la ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-a11y\" \ + -I$(top_srcdir) \ +@@ -407,6 +404,7 @@ + -DG_DISABLE_DEPRECATED \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + libevolution_addressbook_a11y_la_SOURCES = \ + ea-minicard.c \ + ea-minicard.h \ +@@ -417,76 +415,89 @@ + ea-addressbook.c \ + ea-addressbook.h + ++ + libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED) ++ + libevolution_addressbook_a11y_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++subdir = a11y/addressbook ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libevolution_addressbook_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la ++@OS_WIN32_FALSE@libevolution_addressbook_a11y_la_DEPENDENCIES = ++am_libevolution_addressbook_a11y_la_OBJECTS = ea-minicard.lo \ ++ ea-minicard-view.lo ea-addressbook-view.lo ea-addressbook.lo ++libevolution_addressbook_a11y_la_OBJECTS = \ ++ $(am_libevolution_addressbook_a11y_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-addressbook-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-addressbook.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-minicard-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-minicard.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/addressbook/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu a11y/addressbook/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-addressbook-a11y.la: $(libevolution_addressbook_a11y_la_OBJECTS) $(libevolution_addressbook_a11y_la_DEPENDENCIES) +- $(libevolution_addressbook_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_addressbook_a11y_la_OBJECTS) $(libevolution_addressbook_a11y_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_addressbook_a11y_la_LDFLAGS) $(libevolution_addressbook_a11y_la_OBJECTS) $(libevolution_addressbook_a11y_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -497,25 +508,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ea-minicard.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -523,6 +546,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -531,7 +566,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -543,11 +577,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -570,23 +603,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -600,10 +638,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -623,7 +660,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +674,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -685,23 +712,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/a11y/calendar/Makefile.in evolution-2.12.2/a11y/calendar/Makefile.in +--- evolution-2.12.2.orig/a11y/calendar/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/a11y/calendar/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -19,11 +19,16 @@ + # for debug + #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror + ++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 +@@ -35,63 +40,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = a11y/calendar +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_calendar_a11y_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/a11y/libevolution-a11y.la \ +- $(am__DEPENDENCIES_1) +-am_libevolution_calendar_a11y_la_OBJECTS = ea-calendar.lo \ +- ea-calendar-helpers.lo ea-cal-view.lo ea-cal-view-event.lo \ +- ea-day-view.lo ea-day-view-main-item.lo ea-day-view-cell.lo \ +- ea-week-view.lo ea-week-view-main-item.lo ea-week-view-cell.lo \ +- ea-jump-button.lo ea-gnome-calendar.lo +-libevolution_calendar_a11y_la_OBJECTS = \ +- $(am_libevolution_calendar_a11y_la_OBJECTS) +-libevolution_calendar_a11y_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_calendar_a11y_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_calendar_a11y_la_SOURCES) +-DIST_SOURCES = $(libevolution_calendar_a11y_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -125,6 +80,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -136,6 +93,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -161,6 +142,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -186,7 +169,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -194,7 +185,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -252,22 +242,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -276,6 +270,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -300,6 +296,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -308,6 +305,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -315,7 +314,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -324,21 +322,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -346,7 +342,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -376,7 +371,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -395,17 +389,17 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-calendar.la + ++ + privsolib_LTLIBRARIES = libevolution-calendar-a11y.la ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-a11y\" \ + -I$(top_srcdir) \ +@@ -415,6 +409,7 @@ + -I$(top_srcdir)/a11y \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + libevolution_calendar_a11y_la_SOURCES = \ + ea-calendar.c \ + ea-calendar.h \ +@@ -441,77 +436,103 @@ + ea-gnome-calendar.c \ + ea-gnome-calendar.h + ++ + libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED) ++ + libevolution_calendar_a11y_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(EVOLUTION_CALENDAR_LIBS) + ++subdir = a11y/calendar ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libevolution_calendar_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-calendar.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la ++@OS_WIN32_FALSE@libevolution_calendar_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la ++am_libevolution_calendar_a11y_la_OBJECTS = ea-calendar.lo \ ++ ea-calendar-helpers.lo ea-cal-view.lo ea-cal-view-event.lo \ ++ ea-day-view.lo ea-day-view-main-item.lo ea-day-view-cell.lo \ ++ ea-week-view.lo ea-week-view-main-item.lo ea-week-view-cell.lo \ ++ ea-jump-button.lo ea-gnome-calendar.lo ++libevolution_calendar_a11y_la_OBJECTS = \ ++ $(am_libevolution_calendar_a11y_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-cal-view-event.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-cal-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-calendar-helpers.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-day-view-cell.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-day-view-main-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-day-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-gnome-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-jump-button.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-week-view-cell.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-week-view-main-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-week-view.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_calendar_a11y_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_calendar_a11y_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/calendar/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu a11y/calendar/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-calendar-a11y.la: $(libevolution_calendar_a11y_la_OBJECTS) $(libevolution_calendar_a11y_la_DEPENDENCIES) +- $(libevolution_calendar_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_calendar_a11y_la_OBJECTS) $(libevolution_calendar_a11y_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_calendar_a11y_la_LDFLAGS) $(libevolution_calendar_a11y_la_OBJECTS) $(libevolution_calendar_a11y_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -530,25 +551,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ea-week-view.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -556,6 +589,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -564,7 +609,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -576,11 +620,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -603,23 +646,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -633,10 +681,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -656,7 +703,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -670,34 +717,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -718,23 +755,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/a11y/e-table/Makefile.in evolution-2.12.2/a11y/e-table/Makefile.in +--- evolution-2.12.2.orig/a11y/e-table/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/a11y/e-table/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,53 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = a11y/e-table +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libgal_a11y_etable_la_LIBADD = +-am_libgal_a11y_etable_la_OBJECTS = gal-a11y-e-tree.lo \ +- gal-a11y-e-tree-factory.lo gal-a11y-e-cell.lo \ +- gal-a11y-e-cell-text.lo gal-a11y-e-cell-tree.lo \ +- gal-a11y-e-cell-toggle.lo gal-a11y-e-cell-popup.lo \ +- gal-a11y-e-cell-registry.lo gal-a11y-e-cell-vbox.lo \ +- gal-a11y-e-table.lo gal-a11y-e-table-item.lo \ +- gal-a11y-e-table-item-factory.lo \ +- gal-a11y-e-table-click-to-add.lo \ +- gal-a11y-e-table-column-header.lo \ +- gal-a11y-e-table-click-to-add-factory.lo \ +- gal-a11y-e-table-factory.lo +-libgal_a11y_etable_la_OBJECTS = $(am_libgal_a11y_etable_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libgal_a11y_etable_la_SOURCES) +-DIST_SOURCES = $(libgal_a11y_etable_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -110,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -121,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -146,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -171,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -179,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -237,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -261,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -293,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -300,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -309,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -331,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -361,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -380,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -392,7 +393,9 @@ + $(GNOME_PLATFORM_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-table\" + ++ + noinst_LTLIBRARIES = libgal-a11y-etable.la ++ + libgal_a11y_etable_la_SOURCES = \ + gal-a11y-e-tree.c \ + gal-a11y-e-tree-factory.c \ +@@ -427,53 +430,81 @@ + gal-a11y-e-table-item-factory.h \ + gal-a11y-e-table-factory.h + ++subdir = a11y/e-table ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libgal_a11y_etable_la_LDFLAGS = ++libgal_a11y_etable_la_LIBADD = ++am_libgal_a11y_etable_la_OBJECTS = gal-a11y-e-tree.lo \ ++ gal-a11y-e-tree-factory.lo gal-a11y-e-cell.lo \ ++ gal-a11y-e-cell-text.lo gal-a11y-e-cell-tree.lo \ ++ gal-a11y-e-cell-toggle.lo gal-a11y-e-cell-popup.lo \ ++ gal-a11y-e-cell-registry.lo gal-a11y-e-cell-vbox.lo \ ++ gal-a11y-e-table.lo gal-a11y-e-table-item.lo \ ++ gal-a11y-e-table-item-factory.lo \ ++ gal-a11y-e-table-click-to-add.lo \ ++ gal-a11y-e-table-column-header.lo \ ++ gal-a11y-e-table-click-to-add-factory.lo \ ++ gal-a11y-e-table-factory.lo ++libgal_a11y_etable_la_OBJECTS = $(am_libgal_a11y_etable_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gal-a11y-e-cell-popup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-registry.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-text.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-toggle.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-tree.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-vbox.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-click-to-add-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-click-to-add.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-column-header.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-item-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-tree-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-tree.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libgal_a11y_etable_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libgal_a11y_etable_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/e-table/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu a11y/e-table/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgal-a11y-etable.la: $(libgal_a11y_etable_la_OBJECTS) $(libgal_a11y_etable_la_DEPENDENCIES) +- $(LINK) $(libgal_a11y_etable_la_OBJECTS) $(libgal_a11y_etable_la_LIBADD) $(LIBS) ++ $(LINK) $(libgal_a11y_etable_la_LDFLAGS) $(libgal_a11y_etable_la_OBJECTS) $(libgal_a11y_etable_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -496,25 +527,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-a11y-e-tree.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -522,6 +565,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -530,7 +585,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -542,11 +596,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -569,23 +622,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -599,6 +657,7 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: + install: install-am + install-exec: install-exec-am +@@ -619,7 +678,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -633,34 +692,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -681,22 +730,18 @@ + + 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 \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am install-man \ + install-strip installcheck 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 ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool 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 -ruN evolution-2.12.2.orig/a11y/e-text/Makefile.in evolution-2.12.2/a11y/e-text/Makefile.in +--- evolution-2.12.2.orig/a11y/e-text/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/a11y/e-text/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,44 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = a11y/e-text +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libgal_a11y_etext_la_LIBADD = +-am_libgal_a11y_etext_la_OBJECTS = gal-a11y-e-text-factory.lo \ +- gal-a11y-e-text.lo +-libgal_a11y_etext_la_OBJECTS = $(am_libgal_a11y_etext_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libgal_a11y_etext_la_SOURCES) +-DIST_SOURCES = $(libgal_a11y_etext_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -101,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -112,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -137,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -162,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -170,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -228,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -252,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -276,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -284,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -291,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -300,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -322,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -352,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -371,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -383,60 +393,67 @@ + $(GNOME_PLATFORM_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-text\" + ++ + noinst_LTLIBRARIES = libgal-a11y-etext.la ++ + libgal_a11y_etext_la_SOURCES = \ + gal-a11y-e-text-factory.c \ + gal-a11y-e-text.c \ + gal-a11y-e-text-factory.h \ + gal-a11y-e-text.h + ++subdir = a11y/e-text ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libgal_a11y_etext_la_LDFLAGS = ++libgal_a11y_etext_la_LIBADD = ++am_libgal_a11y_etext_la_OBJECTS = gal-a11y-e-text-factory.lo \ ++ gal-a11y-e-text.lo ++libgal_a11y_etext_la_OBJECTS = $(am_libgal_a11y_etext_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gal-a11y-e-text-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-text.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libgal_a11y_etext_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libgal_a11y_etext_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/e-text/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu a11y/e-text/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgal-a11y-etext.la: $(libgal_a11y_etext_la_OBJECTS) $(libgal_a11y_etext_la_DEPENDENCIES) +- $(LINK) $(libgal_a11y_etext_la_OBJECTS) $(libgal_a11y_etext_la_LIBADD) $(LIBS) ++ $(LINK) $(libgal_a11y_etext_la_LDFLAGS) $(libgal_a11y_etext_la_OBJECTS) $(libgal_a11y_etext_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -445,25 +462,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-a11y-e-text.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -471,6 +500,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -479,7 +520,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -491,11 +531,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -518,23 +557,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -548,6 +592,7 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: + install: install-am + install-exec: install-exec-am +@@ -568,7 +613,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -582,34 +627,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -630,22 +665,18 @@ + + 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 \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am install-man \ + install-strip installcheck 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 ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool 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 -ruN evolution-2.12.2.orig/a11y/Makefile.in evolution-2.12.2/a11y/Makefile.in +--- evolution-2.12.2.orig/a11y/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/a11y/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,67 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = a11y +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_a11y_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- e-text/libgal-a11y-etext.la e-table/libgal-a11y-etable.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_libevolution_a11y_la_OBJECTS = ea-cell-table.lo gal-a11y-util.lo +-libevolution_a11y_la_OBJECTS = $(am_libevolution_a11y_la_OBJECTS) +-libevolution_a11y_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_a11y_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_a11y_la_SOURCES) +-DIST_SOURCES = $(libevolution_a11y_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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -124,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -135,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -160,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -185,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -193,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -251,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -275,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -299,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -307,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -314,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -323,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -345,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -375,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -394,27 +384,28 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + + # Somewhat odd looking to have "." in SUBDIRS, but apparently it works? + SUBDIRS = e-text e-table . calendar widgets addressbook ++ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libetable.la \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la + + ++ + # for debug + #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror + privsolib_LTLIBRARIES = libevolution-a11y.la ++ + INCLUDES = \ + $(A11Y_CFLAGS) + ++ + libevolution_a11y_la_SOURCES = \ + ea-factory.h \ + ea-cell-table.h \ +@@ -423,7 +414,9 @@ + gal-a11y-util.h \ + gal-a11y-factory.h + ++ + libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED) ++ + libevolution_a11y_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + e-text/libgal-a11y-etext.la \ +@@ -431,71 +424,92 @@ + $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) + ++subdir = a11y ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libevolution_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libetable.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ ++@OS_WIN32_TRUE@ e-text/libgal-a11y-etext.la \ ++@OS_WIN32_TRUE@ e-table/libgal-a11y-etable.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la ++@OS_WIN32_FALSE@libevolution_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ e-text/libgal-a11y-etext.la \ ++@OS_WIN32_FALSE@ e-table/libgal-a11y-etable.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la ++am_libevolution_a11y_la_OBJECTS = ea-cell-table.lo gal-a11y-util.lo ++libevolution_a11y_la_OBJECTS = $(am_libevolution_a11y_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-cell-table.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-util.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_a11y_la_SOURCES) ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) ++SOURCES = $(libevolution_a11y_la_SOURCES) ++ + all: all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu a11y/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-a11y.la: $(libevolution_a11y_la_OBJECTS) $(libevolution_a11y_la_DEPENDENCIES) +- $(libevolution_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_a11y_la_OBJECTS) $(libevolution_a11y_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_a11y_la_LDFLAGS) $(libevolution_a11y_la_OBJECTS) $(libevolution_a11y_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -504,25 +518,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-a11y-util.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -530,6 +556,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, +@@ -537,13 +567,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -555,20 +579,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -589,7 +608,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -600,6 +619,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -608,22 +635,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -633,11 +657,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -660,23 +683,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -687,19 +715,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -709,9 +733,8 @@ + all-am: Makefile $(LTLIBRARIES) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -731,7 +754,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -745,34 +768,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-recursive + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -793,26 +806,28 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + +-.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-privsolibLTLIBRARIES ctags ctags-recursive distclean \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-privsolibLTLIBRARIES \ ++ 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-privsolibLTLIBRARIES \ +- 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-privsolibLTLIBRARIES ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-privsolibLTLIBRARIES install-recursive install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ installdirs-recursive maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-privsolibLTLIBRARIES \ ++ uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/a11y/widgets/Makefile.in evolution-2.12.2/a11y/widgets/Makefile.in +--- evolution-2.12.2.orig/a11y/widgets/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/a11y/widgets/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -17,11 +17,16 @@ + # for debug + #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror + ++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 +@@ -33,61 +38,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = a11y/widgets +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_widgets_a11y_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/a11y/libevolution-a11y.la \ +- $(am__DEPENDENCIES_1) +-am_libevolution_widgets_a11y_la_OBJECTS = ea-calendar-item.lo \ +- ea-calendar-cell.lo ea-combo-button.lo ea-expander.lo \ +- ea-widgets.lo +-libevolution_widgets_a11y_la_OBJECTS = \ +- $(am_libevolution_widgets_a11y_la_OBJECTS) +-libevolution_widgets_a11y_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(libevolution_widgets_a11y_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_widgets_a11y_la_SOURCES) +-DIST_SOURCES = $(libevolution_widgets_a11y_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -121,6 +78,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -132,6 +91,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -157,6 +140,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -182,7 +167,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -190,7 +183,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -248,22 +240,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -272,6 +268,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -296,6 +294,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -304,6 +303,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -311,7 +312,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -320,21 +320,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -342,7 +340,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -372,7 +369,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -391,14 +387,14 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la ++ + privsolib_LTLIBRARIES = libevolution-widgets-a11y.la ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-a11y\" \ + -I$(top_srcdir) \ +@@ -406,6 +402,7 @@ + -I$(top_srcdir)/widgets \ + $(E_WIDGETS_CFLAGS) + ++ + libevolution_widgets_a11y_la_SOURCES = \ + ea-calendar-item.c \ + ea-calendar-item.h \ +@@ -418,77 +415,93 @@ + ea-widgets.c \ + ea-widgets.h + ++ + libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED) ++ + libevolution_widgets_a11y_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(E_WIDGETS_LIBS) + ++subdir = a11y/widgets ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libevolution_widgets_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la ++@OS_WIN32_FALSE@libevolution_widgets_a11y_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la ++am_libevolution_widgets_a11y_la_OBJECTS = ea-calendar-item.lo \ ++ ea-calendar-cell.lo ea-combo-button.lo ea-expander.lo \ ++ ea-widgets.lo ++libevolution_widgets_a11y_la_OBJECTS = \ ++ $(am_libevolution_widgets_a11y_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-calendar-cell.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-calendar-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-combo-button.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-expander.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ea-widgets.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_widgets_a11y_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_widgets_a11y_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/widgets/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu a11y/widgets/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-widgets-a11y.la: $(libevolution_widgets_a11y_la_OBJECTS) $(libevolution_widgets_a11y_la_DEPENDENCIES) +- $(libevolution_widgets_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_widgets_a11y_la_OBJECTS) $(libevolution_widgets_a11y_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_widgets_a11y_la_LDFLAGS) $(libevolution_widgets_a11y_la_OBJECTS) $(libevolution_widgets_a11y_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -500,25 +513,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ea-widgets.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -526,6 +551,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -534,7 +571,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -546,11 +582,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -573,23 +608,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -603,10 +643,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -626,7 +665,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -640,34 +679,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -688,23 +717,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/aclocal.m4 evolution-2.12.2/aclocal.m4 +--- evolution-2.12.2.orig/aclocal.m4 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/aclocal.m4 2007-12-05 15:54:42.000000000 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10 -*- Autoconf -*- ++# generated automatically by aclocal 1.7.9 -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 ++# Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,120 +11,437 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-m4_if(m4_PACKAGE_VERSION, [2.61],, +-[m4_fatal([this file was generated for autoconf 2.61. +-You have another version of autoconf. If you want to use that, +-you should regenerate the build system entirely.], [63])]) ++# evolution/acinclude.m4 ++# shared configure.in hacks between Evolution and Connector + +-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# serial 1 + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.10' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++# EVO_PURIFY_SUPPORT ++# Add --enable-purify. If the user turns it on, subst PURIFY and set ++# the automake conditional ENABLE_PURIFY ++AC_DEFUN([EVO_PURIFY_SUPPORT], [ ++ AC_ARG_ENABLE([purify], ++ AC_HELP_STRING([--enable-purify], ++ [Enable support for building executables with Purify.]),,[enable_purify=no]) ++ AC_PATH_PROG(PURIFY, purify, impure) ++ AC_ARG_WITH([purify-options], ++ AC_HELP_STRING([--with-purify-options=OPTIONS], ++ [Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])) ++ if test "x$with_purify_options" = "xno"; then ++ with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify" ++ fi ++ if test "x$PURIFYOPTIONS" = "x"; then ++ PURIFYOPTIONS=$with_purify_options ++ fi ++ AC_SUBST(PURIFY) ++ AM_CONDITIONAL(ENABLE_PURIFY, [test x$enable_purify = xyes -a x$PURIFY != ximpure]) ++ PURIFY="$PURIFY $PURIFYOPTIONS" + ]) + +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10])dnl +-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) ++# EVO_LDAP_CHECK(default) ++# Add --with-openldap and --with-static-ldap options. --with-openldap ++# defaults to the given value if not specified. If LDAP support is ++# configured, HAVE_LDAP will be defined and the automake conditional ++# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set ++# appropriately. ++AC_DEFUN([EVO_LDAP_CHECK], [ ++ default="$1" ++ ++ AC_ARG_WITH([openldap], ++ AC_HELP_STRING([--with-openldap], ++ [Enable LDAP support in evolution])) ++ AC_ARG_WITH([static-ldap], ++ AC_HELP_STRING([--with-static-ldap], ++ [Link LDAP support statically into evolution])) ++ AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}") ++ case $ac_cv_with_openldap in ++ no|"") ++ with_openldap=no ++ ;; ++ yes) ++ with_openldap=/usr ++ ;; ++ *) ++ with_openldap=$ac_cv_with_openldap ++ LDAP_CFLAGS="-I$ac_cv_with_openldap/include" ++ LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib" ++ ;; ++ esac + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ if test "$with_openldap" != no; then ++ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ case $with_static_ldap in ++ no|"") ++ with_static_ldap=no ++ ;; ++ *) ++ with_static_ldap=yes ++ ;; ++ esac ++ ++ AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [ ++ CPPFLAGS_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS" ++ AC_EGREP_CPP(yes, [ ++ #include "ldap.h" ++ #if LDAP_VENDOR_VERSION > 20000 ++ yes ++ #endif ++ ], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no) ++ CPPFLAGS="$CPPFLAGS_save" ++ ]) ++ if test "$ac_cv_openldap_version2" = no; then ++ AC_MSG_ERROR(evolution requires OpenLDAP version >= 2) ++ fi + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. +-# +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir +-# +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. +-# +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. +-# +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. ++ AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv") ++ AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") ++ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") ++ AC_CHECK_LIB(lber, ber_get_tag, [ ++ if test "$with_static_ldap" = "yes"; then ++ LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS" ++ ++ # libldap might depend on OpenSSL... We need to pull ++ # in the dependency libs explicitly here since we're ++ # not using libtool for the configure test. ++ if test -f $with_openldap/lib/libldap.la; then ++ LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" ++ fi ++ else ++ LDAP_LIBS="-llber $LDAP_LIBS" ++ fi ++ AC_CHECK_LIB(ldap, ldap_open, [ ++ if test $with_static_ldap = "yes"; then ++ LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS" ++ else ++ LDAP_LIBS="-lldap $LDAP_LIBS" ++ fi], ++ LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) ++ LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS" ++ ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) + +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` ++ if test -z "$LDAP_LIBS"; then ++ AC_MSG_ERROR(could not find OpenLDAP libraries) ++ fi ++ ++ AC_SUBST(LDAP_CFLAGS) ++ AC_SUBST(LDAP_LIBS) ++ fi ++ AM_CONDITIONAL(ENABLE_LDAP, test $with_openldap != no) + ]) + +-# AM_CONDITIONAL -*- Autoconf -*- ++# EVO_SUNLDAP_CHECK ++# Add --with-sunldap and --with-static-sunldap options. --with-sunldap ++# defaults to the given value if not specified. If LDAP support is ++# configured, HAVE_LDAP will be defined and the automake conditional +# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set ++# appropriately, and --with-sunldap and --with-openldap is mutually exclusive. ++AC_DEFUN([EVO_SUNLDAP_CHECK], [ ++ default="$1" ++ ++ AC_ARG_WITH([sunldap], ++ AC_HELP_STRING([--with-sunldap], ++ [Enable SunLDAP support in evolution])) ++ AC_ARG_WITH([static-sunldap], ++ AC_HELP_STRING([--with-static-sunldap], ++ [Link SunLDAP support statically into evolution ])) ++ AC_CACHE_CHECK([for SunLDAP], ac_cv_with_sunldap, ac_cv_with_sunldap="${with_sunldap:=$default}") ++ case $ac_cv_with_sunldap in ++ no|"") ++ with_sunldap=no ++ ;; ++ yes) ++ with_sunldap=/usr ++ ;; ++ *) ++ with_sunldap=$ac_cv_with_sunldap ++ LDAP_CFLAGS="-I$ac_cv_with_sunldap/include" ++ LDAP_LDFLAGS="-L$ac_cv_with_sunldap/lib" ++ ;; ++ esac ++ ++ if test "$with_sunldap" != no; then ++ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) ++ AC_DEFINE(SUNLDAP, 1, [Define if you use SunLDAP]) ++ ++ case $with_static_sunldap in ++ no|"") ++ with_static_sunldap=no ++ ;; ++ *) ++ with_static_sunldap=yes ++ ;; ++ esac ++ ++ AC_CACHE_CHECK(if SunLDAP is version 2.x, ac_cv_sunldap_version2, [ ++ CPPFLAGS_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS" ++ AC_EGREP_CPP(yes, [ ++ #include "ldap.h" ++ #if LDAP_VENDOR_VERSION >= 500 ++ yes ++ #endif ++ ], ac_cv_sunldap_version2=yes, ac_cv_sunldap_version2=no) ++ CPPFLAGS="$CPPFLAGS_save" ++ ]) ++ if test "$ac_cv_sunldap_version2" = no; then ++ AC_MSG_ERROR(evolution requires SunLDAP version >= 2) ++ fi ++ ++ AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv") ++ AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") ++ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") ++ AC_CHECK_LIB(ldap, ldap_open, [ ++ if test $with_static_sunldap = "yes"; then ++ LDAP_LIBS="$with_sunldap/lib/libldap.a $LDAP_LIBS" ++ else ++ LDAP_LIBS="-lldap $LDAP_LIBS" ++ fi ++ if test `uname -s` != "SunOS" ; then ++ AC_CHECK_LIB(lber, ber_get_tag, [ ++ if test "$with_static_sunldap" = "yes"; then ++ LDAP_LIBS="$with_sunldap/lib/liblber.a $LDAP_LIBS" ++ # libldap might depend on OpenSSL... We need to pull ++ # in the dependency libs explicitly here since we're ++ # not using libtool for the configure test. ++ if test -f $with_sunldap/lib/libldap.la; then ++ LDAP_LIBS="`. $with_sunldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" ++ fi ++ else ++ LDAP_LIBS="-llber $LDAP_LIBS" ++ fi], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) ++ fi ++ LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS" ++ ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. ++ if test -z "$LDAP_LIBS"; then ++ AC_MSG_ERROR(could not find SunLDAP libraries) ++ fi ++ ++ AC_SUBST(LDAP_CFLAGS) ++ AC_SUBST(LDAP_LIBS) ++ fi ++ AM_CONDITIONAL(ENABLE_LDAP, test $with_sunldap != no) ++]) ++ ++# EVO_PTHREAD_CHECK ++AC_DEFUN([EVO_PTHREAD_CHECK],[ ++ PTHREAD_LIB="" ++ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", ++ [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", ++ [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", ++ [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread", ++ [AC_CHECK_FUNC(pthread_create)] ++ )] ++ )] ++ )] ++ ) ++ AC_SUBST(PTHREAD_LIB) ++ AC_PROVIDE([EVO_PTHREAD_CHECK]) ++]) ++dnl -*- mode: autoconf -*- ++ ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ AC_ARG_WITH([html-dir], ++ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ [with_html_dir='${datadir}/gtk-doc/html']) ++ HTML_DIR="$with_html_dir" ++ AC_SUBST(HTML_DIR) ++ ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AC_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [default=no]]),, ++ enable_gtk_doc=no) ++ ++ have_gtk_doc=no ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi ++ ++ dnl do we want to do a version check? ++ifelse([$1],[],, ++ [gtk_doc_min_version=$1 ++ if test "$have_gtk_doc" = yes; then ++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_RESULT(no) ++ have_gtk_doc=no ++ fi ++ fi ++]) ++ if test x$enable_gtk_doc = xyes; then ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi ++ fi ++ ++ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) ++ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") ++]) ++ ++# PILOT_LINK_CHECK ++# Adds --with-pisock and determines the verion of the pisock + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# serial 8 ++AC_SUBST(PISOCK_CFLAGS) ++AC_SUBST(PISOCK_LIBS) ++ ++AC_DEFUN([PILOT_LINK_HOOK],[ ++ AC_ARG_WITH([pisock], ++ AC_HELP_STRING([--with-pisock], ++ [Specify prefix for pisock files]), ++ [ ++ if test x$withval = xyes; then ++ dnl Note that an empty true branch is not valid sh syntax. ++ ifelse([$1], [], :, [$1]) ++ else ++ PISOCK_CFLAGS="-I$withval/include" ++ incdir="$withval/include" ++ PISOCK_LIBS="-L$withval/lib -lpisock -lpisync" ++ AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so") ++ if test -r $withval/lib/libpisock.so; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ++ fi ++ fi ++ ]) ++ ++ if test x$PISOCK_CFLAGS = x; then ++ AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [ ++ AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock" ++ piversion_include="libpisock/pi-version.h" ++ incdir="/usr/include/libpisock" ++ ], [ ++ AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock" ++ piversion_include="$prefix/include/pi-version.h" ++ if test x$PISOCK_LIBDIR = x; then ++ incdir="$prefix/include" ++ PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync" ++ fi ], ++ AC_MSG_ERROR([Unable to find pi-version.h])) ++ ]) ++ ]) ++ fi ++ ++ if test "x$PISOCK_LIBS" = "x"; then ++ AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock -lpisync"], ++ [ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ]) ++ fi ++ ++ AC_ARG_ENABLE([pilotlinktest], ++ AC_HELP_STRING([--enable-pilotlinktest], ++ [Test for correct version of pilot-link]), ++ [testplversion=$enableval], ++ [testplversion=yes] ++ ) ++ ++ if test x$piversion_include = x; then ++ piversion_include="pi-version.h" ++ fi ++ ++ pi_major=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_VERSION'|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'` ++ pi_minor=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MAJOR'|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'` ++ pi_micro=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MINOR'|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'` ++ pi_patch=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_PATCH'|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'` ++ ++ PILOT_LINK_MAJOR="$pi_major" ++ PILOT_LINK_MINOR="$pi_minor" ++ PILOT_LINK_MICRO="$pi_micro" ++ PILOT_LINK_PATCH="$pi_patch" ++ PILOT_LINK_VERSION="$pi_major.$pi_minor.$pi_micro$pi_patch" ++ ++ if test x$testplversion = xyes; then ++ AC_MSG_CHECKING([for pilot-link version >= $1]) ++ pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ pl_mc=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ CFLAGS_save="$CFLAGS" ++ CFLAGS="$CFLAGS $PISOCK_CFLAGS" ++ AC_TRY_RUN( ++ [ ++ #include <$piversion_include> ++ int main(int argc,char *argv[]) { ++ if (PILOT_LINK_VERSION == $pl_ma) { ++ if (PILOT_LINK_MAJOR == $pl_mi) { ++ if (PILOT_LINK_MINOR >= $pl_mc) { ++ return 0; ++ } ++ } else if (PILOT_LINK_MAJOR > $pl_mi) { ++ return 0; ++ } ++ } else if (PILOT_LINK_VERSION > $pl_ma) { ++ return 0; ++ } ++ return 1; ++ } ++ ], ++ [AC_MSG_RESULT([yes (found $PILOT_LINK_VERSION)])], ++ [AC_MSG_ERROR([pilot-link >= $1 required])], ++ [AC_MSG_WARN([No action taken for crosscompile])] ++ ) ++ CFLAGS="$CFLAGS_save" ++ fi ++ ++ unset piversion_include ++ unset pi_verion ++ unset pi_major ++ unset pi_minor ++ unset pi_patch ++ unset incdir ++ unset pl_mi ++ unset pl_ma ++ unset pl_ve ++]) ++ ++AC_DEFUN([PILOT_LINK_CHECK],[ ++ PILOT_LINK_HOOK($1,[],nofailure) ++]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 5 ++ ++AC_PREREQ(2.52) + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- + # Define a conditional. + AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE]) ++AC_SUBST([$1_FALSE]) + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -134,4828 +451,4070 @@ + fi + AC_CONFIG_COMMANDS_PRE( + [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) ++ AC_MSG_ERROR([conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 9 ++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + ++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++# ----------------------------------------------------------- ++# If this macro is not defined by Autoconf, define it here. ++m4_ifdef([AC_PROVIDE_IFELSE], ++ [], ++ [m4_define([AC_PROVIDE_IFELSE], ++ [m4_ifdef([AC_PROVIDE_$1], ++ [$2], [$3])])]) + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl + +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++# AC_PROG_LIBTOOL ++# --------------- ++AC_DEFUN([AC_PROG_LIBTOOL], ++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++ AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [AC_LIBTOOL_CXX], ++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++ ])]) ++dnl And a similar setup for Fortran 77 support ++ AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [AC_LIBTOOL_F77], ++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++])]) + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub ++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++ AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [ifdef([AC_PROG_GCJ], ++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([A][M_PROG_GCJ], ++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([LT_AC_PROG_GCJ], ++ [define([LT_AC_PROG_GCJ], ++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++])])# AC_PROG_LIBTOOL + +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done ++# _AC_PROG_LIBTOOL ++# ---------------- ++AC_DEFUN([_AC_PROG_LIBTOOL], ++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL + + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) ++# AC_LIBTOOL_SETUP ++# ---------------- ++AC_DEFUN([AC_LIBTOOL_SETUP], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AC_ENABLE_SHARED])dnl ++AC_REQUIRE([AC_ENABLE_STATIC])dnl ++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_LD])dnl ++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++AC_REQUIRE([AC_PROG_NM])dnl + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++AC_REQUIRE([AC_PROG_LN_S])dnl ++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++AC_REQUIRE([AC_OBJEXT])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++dnl + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR + +-#serial 3 ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES + fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ;; ++esac + ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +-# serial 8 ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++# Constants: ++rm="rm -f" + +-# Do all the work for Automake. -*- Autoconf -*- ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" + +-# serial 12 ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.60])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo ++_LT_CC_BASENAME([$compiler]) ++ ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ AC_PATH_MAGIC + fi +-fi +-AC_SUBST([CYGPATH_W]) ++ ;; ++esac + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++enable_win32_dll=yes, enable_win32_dll=no) + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-]) ++AC_ARG_WITH([pic], ++ [AC_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++test -z "$pic_mode" && pic_mode=default + ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. + +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $1 | $1:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER + +-# serial 2 + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) + +-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE + +-# AM_PROG_LEX +-# ----------- +-# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a +-# "missing" invocation, for better error output. +-AC_DEFUN([AM_PROG_LEX], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl +-AC_REQUIRE([AC_PROG_LEX])dnl +-if test "$LEX" = :; then +- LEX=${am_missing_run}flex +-fi]) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# _LT_AC_SYS_LIBPATH_AIX ++# ---------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_AC_SYS_LIBPATH_AIX + +-AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++# _LT_AC_SHELL_INIT(ARG) ++# ---------------------- ++AC_DEFUN([_LT_AC_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_AC_SHELL_INIT + +-# Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# _LT_AC_PROG_ECHO_BACKSLASH ++# -------------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++[_LT_AC_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} + +-# serial 3 ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++echo=${ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} + fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH + +-# serial 5 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break ++ fi ++ done + fi +-]) +- +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 3 +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_RUN_LOG(COMMAND) +-# ------------------- +-# Run COMMAND, save the exit status in ac_status, and log it. +-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +-AC_DEFUN([AM_RUN_LOG], +-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD +- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- (exit $ac_status); }]) +- +-# Check to make sure that the build environment is sane. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. + +-# serial 4 ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo ++ fi ++ fi ++ fi ++ fi + fi +-AC_MSG_RESULT(yes)]) +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi + +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH + +-# Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# _LT_AC_LOCK ++# ----------- ++AC_DEFUN([_LT_AC_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +-# serial 2 +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac + fi +-done +-rm -rf conftest.dir +- +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR +- +-dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +-dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS +-dnl +-AC_DEFUN([AM_PATH_ORBIT2], +-[dnl +-dnl Get the cflags and libraries from the orbit2-config script +-dnl +-AC_ARG_WITH(orbit-prefix,[ --with-orbit-prefix=PFX Prefix where ORBIT is installed (optional)], +- orbit_config_prefix="$withval", orbit_config_prefix="") +-AC_ARG_WITH(orbit-exec-prefix,[ --with-orbit-exec-prefix=PFX Exec prefix where ORBIT is installed (optional)], +- orbit_config_exec_prefix="$withval", orbit_config_exec_prefix="") +-AC_ARG_ENABLE(orbittest, [ --disable-orbittest Do not try to compile and run a test ORBIT program], +- , enable_orbittest=yes) ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; + +- for module in . $4 +- do +- case "$module" in +- server) +- orbit_config_args="$orbit_config_args server" +- ;; +- client) +- orbit_config_args="$orbit_config_args client" +- ;; ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; + esac +- done +- if test x$orbit_config_args = x ; then +- orbit_config_args=server ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac + fi ++ rm -rf conftest* ++ ;; + +- if test x$orbit_config_exec_prefix != x ; then +- orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix" +- if test x${ORBIT_CONFIG+set} != xset ; then +- ORBIT_CONFIG=$orbit_config_exec_prefix/bin/orbit2-config +- fi ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" + fi +- if test x$orbit_config_prefix != x ; then +- orbit_config_args="$orbit_config_args --prefix=$orbit_config_prefix" +- if test x${ORBIT_CONFIG+set} != xset ; then +- ORBIT_CONFIG=$orbit_config_prefix/bin/orbit2-config +- fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac + fi ++ rm -rf conftest* ++ ;; + +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no) +- min_orbit_version=ifelse([$1], , 2.3.0, $1) +- AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version) +- no_orbit="" +- if test "$ORBIT_CONFIG" = "no" ; then +- if test "$PKG_CONFIG" = "no" ; then +- no_orbit=yes +- else +- ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0` +- ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0` +- fi +- else +- ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags` +- ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs` +- fi ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++ ]) ++esac + +- if test "x$no_orbit" = x ; then +- ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0` ++need_locks="$enable_libtool_lock" + +- orbit_config_major_version=`echo $ORBIT_VERSION | \ +- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- orbit_config_minor_version=`echo $ORBIT_VERSION | \ +- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- orbit_config_micro_version=`echo $ORBIT_VERSION | \ +- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_orbittest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $ORBIT_CFLAGS" +- LIBS="$ORBIT_LIBS $LIBS" +-dnl +-dnl Now check if the installed ORBIT is sufficiently new. (Also sanity +-dnl checks the results of orbit2-config to some extent +-dnl +- rm -f conf.orbittest +- AC_TRY_RUN([ +-#include +-#include +-#include ++])# _LT_AC_LOCK + +-int +-main () +-{ +- int major, minor, micro; +- char *tmp_version; + +- system ("touch conf.orbittest"); ++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++]) + +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_orbit_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_orbit_version"); +- exit(1); +- } ++if test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION + +- if ((orbit_major_version != $orbit_config_major_version) || +- (orbit_minor_version != $orbit_config_minor_version) || +- (orbit_micro_version != $orbit_config_micro_version)) +- { +- printf("\n*** 'pkg-config --version ORBit-2.0' returned %d.%d.%d, but ORBit (%d.%d.%d)\n", +- $orbit_config_major_version, $orbit_config_minor_version, $orbit_config_micro_version, +- orbit_major_version, orbit_minor_version, orbit_micro_version); +- printf ("*** was found! If orbit2-config was correct, then it is best\n"); +- printf ("*** to remove the old version of ORBit. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If orbit2-config was wrong, set the environment variable ORBIT_CONFIG\n"); +- printf("*** to point to the correct copy of orbit2-config, and remove the file config.cache\n"); +- printf("*** before re-running configure\n"); +- } +-#if defined (ORBIT_MAJOR_VERSION) && defined (ORBIT_MINOR_VERSION) && defined (ORBIT_MICRO_VERSION) +- else if ((orbit_major_version != ORBIT_MAJOR_VERSION) || +- (orbit_minor_version != ORBIT_MINOR_VERSION) || +- (orbit_micro_version != ORBIT_MICRO_VERSION)) +- { +- printf("*** ORBit header files (version %d.%d.%d) do not match\n", +- ORBIT_MAJOR_VERSION, ORBIT_MINOR_VERSION, ORBIT_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- orbit_major_version, orbit_minor_version, orbit_micro_version); +- } +-#endif /* defined (ORBIT_MAJOR_VERSION) ... */ +- else +- { +- if ((orbit_major_version > major) || +- ((orbit_major_version == major) && (orbit_minor_version > minor)) || +- ((orbit_major_version == major) && (orbit_minor_version == minor) && (orbit_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of ORBit (%d.%d.%d) was found.\n", +- orbit_major_version, orbit_minor_version, orbit_micro_version); +- printf("*** You need a version of ORBit newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** ORBit is always available from ftp://ftp.orbit.org.\n"); +- printf("***\n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the orbit2-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of ORBit, but you can also set the ORBIT_CONFIG environment to point to the\n"); +- printf("*** correct copy of orbit2-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +-} +-],, no_orbit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_orbit" = x ; then +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$ORBIT_CONFIG" = "no" ; then +- echo "*** The orbit2-config script installed by ORBIT could not be found" +- echo "*** If ORBit was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the ORBIT_CONFIG environment variable to the" +- echo "*** full path to orbit2-config." +- else +- if test -f conf.orbittest ; then +- : +- else +- echo "*** Could not run ORBIT test program, checking why..." +- CFLAGS="$CFLAGS $ORBIT_CFLAGS" +- LIBS="$LIBS $ORBIT_LIBS" +- AC_TRY_LINK([ +-#include +-#include +-], [ return ((orbit_major_version) || (orbit_minor_version) || (orbit_micro_version)); ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding ORBit or finding the wrong" +- echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +- echo "***" +- echo "*** If you have a RedHat 5.0 system, you should remove the ORBit package that" +- echo "*** came with the system with the command" +- echo "***" +- echo "*** rpm --erase --nodeps orbit orbit-devel" ], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means ORBIT was incorrectly installed" +- echo "*** or that you have moved ORBit since it was installed. In the latter case, you" +- echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG" ]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" ++ ++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ------------------------------------------------------------ ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes + fi ++ else ++ $2=yes + fi +- ORBIT_CFLAGS="" +- ORBIT_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- +- AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, ifelse([$3], , :, [$3])) +- AC_SUBST(ORBIT_CFLAGS) +- AC_SUBST(ORBIT_LIBS) +- AC_SUBST(ORBIT_IDL) +- rm -f conf.orbittest ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" + ]) + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files +-dnl +- +-AC_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` +- else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE +- fi ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION + +- AC_ARG_WITH(gconf-source, +- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# -------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++[# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; + +- AC_ARG_WITH(gconf-schema-file-dir, +- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +- AC_ARG_ENABLE(schemas-install, +- [ --disable-schemas-install Disable the schemas installation], +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-# Configure paths for GLIB +-# Owen Taylor 1997-2001 ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; + +-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or +-dnl gthread is specified in MODULES, pass to pkg-config +-dnl +-AC_DEFUN([AM_PATH_GLIB_2_0], +-[dnl +-dnl Get the cflags and libraries from pkg-config +-dnl +-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], +- , enable_glibtest=yes) ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; + +- pkg_config_args=glib-2.0 +- for module in . $4 +- do +- case "$module" in +- gmodule) +- pkg_config_args="$pkg_config_args gmodule-2.0" +- ;; +- gmodule-no-export) +- pkg_config_args="$pkg_config_args gmodule-no-export-2.0" +- ;; +- gobject) +- pkg_config_args="$pkg_config_args gobject-2.0" +- ;; +- gthread) +- pkg_config_args="$pkg_config_args gthread-2.0" +- ;; ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac +- done +- +- PKG_PROG_PKG_CONFIG([0.16]) +- +- no_glib="" ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++])# AC_LIBTOOL_SYS_MAX_CMD_LEN + +- if test "x$PKG_CONFIG" = x ; then +- no_glib=yes +- PKG_CONFIG=no +- fi + +- min_glib_version=ifelse([$1], ,2.0.0,$1) +- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN + +- if test x$PKG_CONFIG != xno ; then +- ## don't try to run the test against uninstalled libtool libs +- if $PKG_CONFIG --uninstalled $pkg_config_args; then +- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" +- enable_glibtest=no +- fi + +- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then +- : +- else +- no_glib=yes +- fi +- fi ++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# --------------------------------------------------------------------- ++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext < ++#endif + +- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` +- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` +- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_glibtest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$GLIB_LIBS $LIBS" +-dnl +-dnl Now check if the installed GLIB is sufficiently new. (Also sanity +-dnl checks the results of pkg-config to some extent) +-dnl +- rm -f conf.glibtest +- AC_TRY_RUN([ +-#include + #include +-#include + +-int +-main () +-{ +- int major, minor, micro; +- char *tmp_version; ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +- system ("touch conf.glibtest"); ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_glib_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_glib_version"); +- exit(1); +- } ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif + +- if ((glib_major_version != $glib_config_major_version) || +- (glib_minor_version != $glib_config_minor_version) || +- (glib_micro_version != $glib_config_micro_version)) +- { +- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", +- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, +- glib_major_version, glib_minor_version, glib_micro_version); +- printf ("*** was found! If pkg-config was correct, then it is best\n"); +- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); +- printf("*** to point to the correct configuration files\n"); +- } +- else if ((glib_major_version != GLIB_MAJOR_VERSION) || +- (glib_minor_version != GLIB_MINOR_VERSION) || +- (glib_micro_version != GLIB_MICRO_VERSION)) ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) + { +- printf("*** GLIB header files (version %d.%d.%d) do not match\n", +- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- glib_major_version, glib_minor_version, glib_micro_version); ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ + } + else +- { +- if ((glib_major_version > major) || +- ((glib_major_version == major) && (glib_minor_version > minor)) || +- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); +- printf("***\n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); +- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +-} +-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi ++ puts (dlerror ()); ++ ++ exit (status); ++}] ++EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 + fi +- if test "x$no_glib" = x ; then +- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://www.freedesktop.org/software/pkgconfig/" +- else +- if test -f conf.glibtest ; then +- : +- else +- echo "*** Could not run GLIB test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$LIBS $GLIB_LIBS" +- AC_TRY_LINK([ +-#include +-#include +-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding GLIB or finding the wrong" +- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- GLIB_GENMARSHAL="" +- GOBJECT_QUERY="" +- GLIB_MKENUMS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GLIB_CFLAGS) +- AC_SUBST(GLIB_LIBS) +- AC_SUBST(GLIB_GENMARSHAL) +- AC_SUBST(GOBJECT_QUERY) +- AC_SUBST(GLIB_MKENUMS) +- rm -f conf.glibtest +-]) +- +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 +-# +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) +- +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. +-dnl ++fi ++rm -fr conftest* ++])# _LT_AC_TRY_DLOPEN_SELF + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) ++# AC_LIBTOOL_DLOPEN_SELF ++# ---------------------- ++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown + else +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl +-]) ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [AC_REQUIRE([AC_CANONICAL_HOST])dnl +- USE_NLS=yes +- AC_SUBST(USE_NLS) ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; + +- gt_cv_have_gettext=no ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi +- +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) + fi + +- # We need to process the po/ directory. +- POSUB=po +- +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac + +- dnl These rules are solely for the distribution goal. While doing this +- dnl we only have to keep exactly one list of the available catalogs +- dnl in configure.in. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++])# AC_LIBTOOL_DLOPEN_SELF + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi ++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++# --------------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler ++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++]) ++])# AC_LIBTOOL_PROG_CC_C_O + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++# ----------------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++[AC_REQUIRE([_LT_AC_LOCK])dnl + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` ++hard_links="nottested" ++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi + else +- localedir=`eval echo "${datadir}/locale"` ++ need_locks=no + fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) +-]) +- +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl +- +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) +- ++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** +- +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) +- +- AC_ARG_ENABLE(iso-c, +- AC_HELP_STRING([--enable-iso-c], +- [Try to warn if code is not ISO C ]),, +- [enable_iso_c=no]) +- +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCFLAGS) + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) ++# AC_LIBTOOL_OBJDIR ++# ----------------- ++AC_DEFUN([AC_LIBTOOL_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++])# AC_LIBTOOL_OBJDIR + +-dnl For C++, do basically the same thing. + +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) +- +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac ++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++# ---------------------------------------------- ++# Check hardcoding attributes. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_AC_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi ++ # We can hardcode non-existant directories. ++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate + fi +- AC_MSG_RESULT($warnCXXFLAGS) +- +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) +- +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac +- +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) +- +-dnl Do not call GNOME_DOC_DEFINES directly. It is split out from +-dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. +-AC_DEFUN([GNOME_DOC_DEFINES], +-[ +-AC_ARG_WITH([help-dir], +- AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, +- [with_help_dir='${datadir}/gnome/help']) +-HELP_DIR="$with_help_dir" +-AC_SUBST(HELP_DIR) +- +-AC_ARG_WITH([omf-dir], +- AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, +- [with_omf_dir='${datadir}/omf']) +-OMF_DIR="$with_omf_dir" +-AC_SUBST(OMF_DIR) +- +-AC_ARG_WITH([help-formats], +- AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, +- [with_help_formats='']) +-DOC_USER_FORMATS="$with_help_formats" +-AC_SUBST(DOC_USER_FORMATS) +- +-AC_ARG_ENABLE([scrollkeeper], +- [AC_HELP_STRING([--disable-scrollkeeper], +- [do not make updates to the scrollkeeper database])],, +- enable_scrollkeeper=yes) +-AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) +- +-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) +-]) +- +-# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +-# +-AC_DEFUN([GNOME_DOC_INIT], +-[ +-ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) +- +-PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], +- [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) +- +-if test "$gdu_cv_have_gdu" = "yes"; then +- ifelse([$2],,[:],[$2]) + else +- ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported + fi ++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +-GNOME_DOC_DEFINES +-]) +- ++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + +-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +-# serial 36 IT_PROG_INTLTOOL +-AC_DEFUN([IT_PROG_INTLTOOL], +-[AC_PREREQ([2.50])dnl + +-case "$am__api_version" in +- 1.[01234]) +- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) +- ;; +- *) ++# AC_LIBTOOL_SYS_LIB_STRIP ++# ------------------------ ++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++[striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) + ;; +-esac +- +-if test -n "$1"; then +- AC_MSG_CHECKING([for intltool >= $1]) +- +- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` +- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` +- ] +- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) +- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++ esac + fi ++])# AC_LIBTOOL_SYS_LIB_STRIP + +- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' +- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' +- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- +-AC_SUBST(INTLTOOL_DESKTOP_RULE) +-AC_SUBST(INTLTOOL_DIRECTORY_RULE) +-AC_SUBST(INTLTOOL_KEYS_RULE) +-AC_SUBST(INTLTOOL_PROP_RULE) +-AC_SUBST(INTLTOOL_OAF_RULE) +-AC_SUBST(INTLTOOL_PONG_RULE) +-AC_SUBST(INTLTOOL_SERVER_RULE) +-AC_SUBST(INTLTOOL_SHEET_RULE) +-AC_SUBST(INTLTOOL_SOUNDLIST_RULE) +-AC_SUBST(INTLTOOL_UI_RULE) +-AC_SUBST(INTLTOOL_XAM_RULE) +-AC_SUBST(INTLTOOL_KBD_RULE) +-AC_SUBST(INTLTOOL_XML_RULE) +-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) +-AC_SUBST(INTLTOOL_CAVES_RULE) +-AC_SUBST(INTLTOOL_SCHEMAS_RULE) +-AC_SUBST(INTLTOOL_THEME_RULE) +-AC_SUBST(INTLTOOL_SERVICE_RULE) +-AC_SUBST(INTLTOOL_POLICY_RULE) +- +-# Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) +-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +-fi +-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then +- AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +-fi +- +-# Use the tools built into the package, not the ones that are installed. +-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') +- +-AC_PATH_PROG(INTLTOOL_PERL, perl) +-if test -z "$INTLTOOL_PERL"; then +- AC_MSG_ERROR([perl not found; required for intltool]) +-fi +-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- AC_MSG_ERROR([perl 5.x required for intltool]) +-fi +-if test "x$2" != "xno-xml"; then +- AC_MSG_CHECKING([for XML::Parser]) +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- AC_MSG_RESULT([ok]) +- else +- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) +- fi +-fi +- +-# Substitute ALL_LINGUAS so we can use it in po/Makefile +-AC_SUBST(ALL_LINGUAS) + +-# Set DATADIRNAME correctly if it is not set yet +-# (copied from glib-gettext.m4) +-if test -z "$DATADIRNAME"; then +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[]], +- [[extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr]])], +- [DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share +- dnl in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [DATADIRNAME=share], [DATADIRNAME=lib]) +- ;; +- *) +- [DATADIRNAME=lib] +- ;; +- esac]) +-fi +-AC_SUBST(DATADIRNAME) ++# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++m4_if($1,[],[ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) ++need_lib_prefix=unknown ++hardcode_into_libs=no + +-IT_PO_SUBDIR([po]) ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown + +-dnl The following is very similar to +-dnl +-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) +-dnl +-dnl with the following slight differences: +-dnl - the *.in files are in ac_aux_dir, +-dnl - if the file haven't changed upon reconfigure, it's not touched, +-dnl - the evaluation of the third parameter enables a hack which computes +-dnl the actual value of $libdir, +-dnl - the user sees "executing intltool commands", instead of +-dnl "creating intltool-extract" and such. +-dnl +-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were +-dnl a reason for it. ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH + +-AC_CONFIG_COMMANDS([intltool], [ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; + +-for file in intltool-extract intltool-merge intltool-update; do +- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ +- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ +- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ +- < ${ac_aux_dir}/${file}.in > ${file}.out +- if cmp -s ${file} ${file}.out 2>/dev/null; then +- rm -f ${file}.out ++aix4* | aix5*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH + else +- mv -f ${file}.out ${file} ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH + fi +- chmod ugo+x ${file} +- chmod u+w ${file} +-done ++ ;; + +-], +-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' +-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; + +-]) ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; + ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; + +-# IT_PO_SUBDIR(DIRNAME) +-# --------------------- +-# All po subdirs have to be declared with this macro; the subdir "po" is +-# declared by IT_PROG_INTLTOOL. +-# +-AC_DEFUN([IT_PO_SUBDIR], +-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +-dnl +-dnl The following CONFIG_COMMANDS should be exetuted at the very end +-dnl of config.status. +-AC_CONFIG_COMMANDS_PRE([ +- AC_CONFIG_COMMANDS([$1/stamp-it], [ +- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" +- >"$1/stamp-it.tmp" +- [sed '/^#/d +- s/^[[].*] *// +- /^[ ]*$/d +- '"s|^| $ac_top_srcdir/|" \ +- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" +- ] +- if test ! -f "$1/Makefile"; then +- AC_MSG_ERROR([$1/Makefile is not ready.]) +- fi +- mv "$1/Makefile" "$1/Makefile.tmp" +- [sed '/^POTFILES =/,/[^\\]$/ { +- /^POTFILES =/!d +- r $1/POTFILES +- } +- ' "$1/Makefile.tmp" >"$1/Makefile"] +- rm -f "$1/Makefile.tmp" +- mv "$1/stamp-it.tmp" "$1/stamp-it" +- ]) +-])dnl +-]) +- +- +-# deprecated macros +-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +-# A hint is needed for aclocal from Automake <= 1.9.4: +-# AC_DEFUN([AC_PROG_INTLTOOL], ...) +- +- +-# isc-posix.m4 serial 2 (gettext-0.11.2) +-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +- +-# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. +- +-# This test replaces the one in autoconf. +-# Currently this macro should have the same name as the autoconf macro +-# because gettext's gettext.m4 (distributed in the automake package) +-# still uses it. Otherwise, the use in gettext.m4 makes autoheader +-# give these diagnostics: +-# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +-# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX +- +-undefine([AC_ISC_POSIX]) +- +-AC_DEFUN([AC_ISC_POSIX], +- [ +- dnl This test replaces the obsolescent AC_ISC_POSIX kludge. +- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) +- ] +-) +- +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +- +-# serial 48 AC_PROG_LIBTOOL +- +- +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) +- +- +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL +- +- +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no + +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes + ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; + +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; + +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl +-dnl ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; + +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; + +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++freebsd1*) ++ dynamic_linker=no ++ ;; + +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac + fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac + ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; + +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-# Constants: +-rm="rm -f" +- +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" +- +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool +-test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= ++interix[[3-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; + +-if test -n "$RANLIB"; then ++irix5* | irix6* | nonstopux*) + case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= + ;; + *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac + ;; + esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- +-_LT_CC_BASENAME([$compiler]) +- +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes + ;; +-esac +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes + ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi + +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; + ++nto-qnx*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; + +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; + esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) +- ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; + +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; + ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; + +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_LINKER_BOILERPLATE ++rdos*) ++ dynamic_linker=no ++ ;; + ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; + +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# If we don't find anything, use the default library path according +-# to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; + ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; + +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; + +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; + +-case X$ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++*) ++ dynamic_linker=no + ;; + esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no + +-echo=${ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! +- : +-else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi ++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat </dev/null 2>&1 && unset CDPATH ++# _LT_AC_TAGCONFIG ++# ---------------- ++AC_DEFUN([_LT_AC_TAGCONFIG], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_ARG_WITH([tags], ++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++ [include additional configurations @<:@automatic@:>@])], ++ [tagnames="$withval"]) + +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ AC_MSG_WARN([output file `$ofile' does not exist]) ++ fi ++ ++ if test -z "$LTCC"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++ if test -z "$LTCC"; then ++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++ else ++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi +- done +-fi ++ fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. ++ # Extract list of available tagged configurations in $ofile. ++ # Note that this assumes the entire list is on one line. ++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for tagname in $tagnames; do + IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break ++ # Check whether tagname contains only valid characters ++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++ "") ;; ++ *) AC_MSG_ERROR([invalid tag name: $tagname]) ++ ;; ++ esac ++ ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ AC_MSG_ERROR([tag name \"$tagname\" already exists]) + fi +- done +- IFS="$lt_save_ifs" + +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++ case $tagname in ++ CXX) ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_LIBTOOL_LANG_CXX_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ AC_LIBTOOL_LANG_F77_CONFIG + else +- # Oops. We lost completely, so just stick with echo. +- echo=echo ++ tagname="" + fi +- fi ++ ;; ++ ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ AC_LIBTOOL_LANG_GCJ_CONFIG ++ else ++ tagname="" ++ fi ++ ;; ++ ++ RC) ++ AC_LIBTOOL_LANG_RC_CONFIG ++ ;; ++ ++ *) ++ AC_MSG_ERROR([Unsupported tag name: $tagname]) ++ ;; ++ esac ++ ++ # Append the new tag name to the list of available tags. ++ if test -n "$tagname" ; then ++ available_tags="$available_tags $tagname" + fi ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ # Now substitute the updated list of available tags. ++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++ mv "${ofile}T" "$ofile" ++ chmod +x "$ofile" ++ else ++ rm -f "${ofile}T" ++ AC_MSG_ERROR([unable to update list of available tagged configurations.]) + fi + fi +-fi ++])# _LT_AC_TAGCONFIG + +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi + +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH ++# AC_LIBTOOL_DLOPEN ++# ----------------- ++# enable checks for dlopen support ++AC_DEFUN([AC_LIBTOOL_DLOPEN], ++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_DLOPEN + + +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# AC_LIBTOOL_WIN32_DLL ++# -------------------- ++# declare package support for building win32 DLLs ++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_WIN32_DLL + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *32-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac ++# AC_ENABLE_SHARED([DEFAULT]) ++# --------------------------- ++# implement the --enable-shared flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_SHARED], ++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([shared], ++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" + ;; +- *64-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; ++ esac], ++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++])# AC_ENABLE_SHARED + +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) +-esac ++# AC_DISABLE_SHARED ++# ----------------- ++# set the default shared flag to --disable-shared ++AC_DEFUN([AC_DISABLE_SHARED], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_SHARED(no) ++])# AC_DISABLE_SHARED + +-need_locks="$enable_libtool_lock" + +-])# _LT_AC_LOCK ++# AC_ENABLE_STATIC([DEFAULT]) ++# --------------------------- ++# implement the --enable-static flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_STATIC], ++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([static], ++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++])# AC_ENABLE_STATIC + + +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$3" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings other than the usual output. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- fi +- $rm conftest* +-]) ++# AC_DISABLE_STATIC ++# ----------------- ++# set the default static flag to --disable-static ++AC_DEFUN([AC_DISABLE_STATIC], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_STATIC(no) ++])# AC_DISABLE_STATIC + +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION + ++# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++# --------------------------------- ++# implement the --enable-fast-install flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([fast-install], ++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++])# AC_ENABLE_FAST_INSTALL + +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The linker can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- else +- $2=yes +- fi +- fi +- $rm conftest* +- LDFLAGS="$save_LDFLAGS" +-]) + +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION ++# AC_DISABLE_FAST_INSTALL ++# ----------------------- ++# set the default to --disable-fast-install ++AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_FAST_INSTALL(no) ++])# AC_DISABLE_FAST_INSTALL + + +-# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# AC_LIBTOOL_PICMODE([MODE]) + # -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" ++# implement the --with-pic flag ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++AC_DEFUN([AC_LIBTOOL_PICMODE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++pic_mode=ifelse($#,1,$1,default) ++])# AC_LIBTOOL_PICMODE + +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; + +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; ++# AC_PROG_EGREP ++# ------------- ++# This is predefined starting with Autoconf 2.54, so this conditional ++# definition can be removed once we require Autoconf 2.54 or later. ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' ++ fi]) ++ EGREP=$ac_cv_prog_egrep ++ AC_SUBST([EGREP]) ++])]) + +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; + +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; ++# AC_PATH_TOOL_PREFIX ++# ------------------- ++# find a file program which can recognize shared library ++AC_DEFUN([AC_PATH_TOOL_PREFIX], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="ifelse([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <&2 + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++EOF ++ fi ;; ++ esac ++ fi ++ break + fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- ;; ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++])# AC_PATH_TOOL_PREFIX + +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; + +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi ++# AC_PATH_MAGIC ++# ------------- ++# find a file program which can recognize a shared library ++AC_DEFUN([AC_PATH_MAGIC], ++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ else ++ MAGIC_CMD=: ++ fi ++fi ++])# AC_PATH_MAGIC ++ ++ ++# AC_PROG_LD ++# ---------- ++# find the pathname to the GNU or non-GNU linker ++AC_DEFUN([AC_PROG_LD], ++[AC_ARG_WITH([gnu-ld], ++ [AC_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no]) ++AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld + ;; + *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ +- = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown + ;; + esac +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) + else +- AC_MSG_RESULT(none) ++ AC_MSG_CHECKING([for non-GNU ld]) + fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- +- +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN +- +- +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "$cross_compiling" = yes; then : +- [$4] ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 conftest.$ac_ext < +-#endif + +-#include ++# AC_PROG_LD_GNU ++# -------------- ++AC_DEFUN([AC_PROG_LD_GNU], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, ++[# I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 /dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 +- fi +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF ++beos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + ++bsdi[[45]]*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so ++ ;; + +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; + +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; ++mingw* | pw32*) ++ # Base MSYS/MinGW do not provide the 'file' command needed by ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi ++ ;; + +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; + +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ]) +- ;; ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; + *) +- AC_CHECK_FUNC([shl_load], +- [lt_cv_dlopen="shl_load"], +- [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [AC_CHECK_LIB([svld], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], +- [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) +- ]) +- ]) +- ]) +- ]) +- ]) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac ++ ;; + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes ++interix[[3-9]]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +- enable_dlopen=no ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi ++ ;; + +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; + +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown ++ ;; + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ fi ++ ;; + +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) +- fi ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac +-fi +-])# AC_LIBTOOL_DLOPEN_SELF +- +- +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ;; + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- fi +- fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac + ]) +-])# AC_LIBTOOL_PROG_CC_C_O +- ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++])# AC_DEPLIBS_CHECK_METHOD + +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl + +-hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn +- fi ++# AC_PROG_NM ++# ---------- ++# find the pathname to a BSD-compatible name lister ++AC_DEFUN([AC_PROG_NM], ++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" + else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi]) ++NM="$lt_cv_path_NM" ++])# AC_PROG_NM + + +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR ++# AC_CHECK_LIBM ++# ------------- ++# check for math library ++AC_DEFUN([AC_CHECK_LIBM], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it ++ ;; ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++ ;; ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") ++ ;; ++esac ++])# AC_CHECK_LIBM + + +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- +-# Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +-[AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl convenience library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. ++AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ case $enable_ltdl_convenience in ++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++ "") enable_ltdl_convenience=yes ++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ++ esac ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_CONVENIENCE + +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ ++# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl installable library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. ++# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ AC_CHECK_LIB(ltdl, lt_dlinit, ++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++ [if test x"$enable_ltdl_install" = xno; then ++ AC_MSG_WARN([libltdl not installed, but installation disabled]) ++ else ++ enable_ltdl_install=yes ++ fi ++ ]) ++ if test x"$enable_ltdl_install" = x"yes"; then ++ ac_configure_args="$ac_configure_args --enable-ltdl-install" ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= + fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_INSTALLABLE + +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + ++# AC_LIBTOOL_CXX ++# -------------- ++# enable support for C++ libraries ++AC_DEFUN([AC_LIBTOOL_CXX], ++[AC_REQUIRE([_LT_AC_LANG_CXX]) ++])# AC_LIBTOOL_CXX + +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- AC_MSG_RESULT([yes]) +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) +- ;; +- esac +-fi +-])# AC_LIBTOOL_SYS_LIB_STRIP + ++# _LT_AC_LANG_CXX ++# --------------- ++AC_DEFUN([_LT_AC_LANG_CXX], ++[AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++])# _LT_AC_LANG_CXX + +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP + fi +-need_lib_prefix=unknown +-hardcode_into_libs=no ++])# _LT_AC_PROG_CXXCPP + +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown ++# AC_LIBTOOL_F77 ++# -------------- ++# enable support for Fortran 77 libraries ++AC_DEFUN([AC_LIBTOOL_F77], ++[AC_REQUIRE([_LT_AC_LANG_F77]) ++])# AC_LIBTOOL_F77 + +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH + +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; ++# _LT_AC_LANG_F77 ++# --------------- ++AC_DEFUN([_LT_AC_LANG_F77], ++[AC_REQUIRE([AC_PROG_F77]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++])# _LT_AC_LANG_F77 + +-aix4* | aix5*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[[01]] | aix4.[[01]].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; + +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; ++# AC_LIBTOOL_GCJ ++# -------------- ++# enable support for GCJ libraries ++AC_DEFUN([AC_LIBTOOL_GCJ], ++[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++])# AC_LIBTOOL_GCJ + +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; + +-bsdi[[45]]*) +- version_type=linux +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; ++# _LT_AC_LANG_GCJ ++# --------------- ++AC_DEFUN([_LT_AC_LANG_GCJ], ++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++])# _LT_AC_LANG_GCJ + +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes ++# AC_LIBTOOL_RC ++# ------------- ++# enable support for Windows resource files ++AC_DEFUN([AC_LIBTOOL_RC], ++[AC_REQUIRE([LT_AC_PROG_RC]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++])# AC_LIBTOOL_RC + +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- ;; +- esac +- ;; + +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; ++# AC_LIBTOOL_LANG_C_CONFIG ++# ------------------------ ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++[lt_save_CC="$CC" ++AC_LANG_PUSH(C) + +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; ++# Source file extension for C test sources. ++ac_ext=c + +-dgux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; ++# Object file extension for compiled C test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +-freebsd1*) +- dynamic_linker=no +- ;; ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' ++ ++_LT_AC_SYS_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++AC_LIBTOOL_SYS_LIB_STRIP ++AC_LIBTOOL_DLOPEN_SELF ++ ++# Report which library types will actually be built ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) ++ ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no ++ ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi + ;; + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no + fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes + ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- freebsd*) # from 4.6 on +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; ++esac ++AC_MSG_RESULT([$enable_shared]) + +-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- ;; ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) + +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; ++AC_LIBTOOL_CONFIG($1) + +-interix3*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_C_CONFIG + +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; + +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; ++# AC_LIBTOOL_LANG_CXX_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) ++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], ++[AC_LANG_PUSH(C++) ++AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + +-# This must be Linux ELF. +-linux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac ++# Dependencies to place before and after the object being linked: ++_LT_AC_TAGVAR(predep_objects, $1)= ++_LT_AC_TAGVAR(postdep_objects, $1)= ++_LT_AC_TAGVAR(predeps, $1)= ++_LT_AC_TAGVAR(postdeps, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_path, $1)= + +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" +- fi ++# Source file extension for C++ test sources. ++ac_ext=cpp + +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +-knetbsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" + +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_LD=$LD ++lt_save_GCC=$GCC ++GCC=$GXX ++lt_save_with_gnu_ld=$with_gnu_ld ++lt_save_path_LD=$lt_cv_path_LD ++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++else ++ $as_unset lt_cv_prog_gnu_ld ++fi ++if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++else ++ $as_unset lt_cv_path_LD ++fi ++test -z "${LDCXX+set}" || LD=$LDCXX ++CC=${CXX-"c++"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; ++# We don't want -fno-exception wen compiling C++ code, so set the ++# no_builtin_flag separately ++if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++else ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++fi + +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration + +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; ++ AC_PROG_LD + +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + +-sysv4 | sysv4.3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++ grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi + else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; ++ with_gnu_ld=no ++ wlarc= + +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi + +-*) +- dynamic_linker=no +- ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= + fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER +- +- +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi + +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++# PORTME: fill in a description of your system's C++ link characteristics ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++_LT_AC_TAGVAR(ld_shlibs, $1)=yes ++case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aix4* | aix5*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" + else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` ++ aix_use_runtimelinking=no + +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done + ;; +- esac ++ esac + +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' + fi + +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : + else +- tagname="" ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' + else +- tagname="" ++ shared_flag='${wl}-bM:SRE' + fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi ++ fi + fi +- done +- IFS="$lt_save_ifs" + +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi +-fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no ++ output_verbose_link_cmd='echo' ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes ++ fi ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ fi ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; + ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before switch to ELF ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ freebsd-elf*) ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ gnu*) ++ ;; ++ hpux9*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. + +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; + *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi + ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL ++ esac ++ ;; ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ++ case $host_cpu in ++ hppa*64*|ia64*) ;; ++ *) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac + +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ interix[[3-9]]*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ fi ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + +-# AC_LIBTOOL_PICMODE([MODE]) +-# -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc*) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC*) ++ # Portland Group C++ compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognise shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <&2 +- +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-EOF +- fi ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; + esac ++ ;; ++ esac ++ ;; ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi +- break ++ output_verbose_link_cmd='echo' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX ++ ;; ++ osf3*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognise a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +- else +- MAGIC_CMD=: +- fi +-fi +-])# AC_PATH_MAGIC ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + +-# AC_PROG_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- ;; ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + esac +- else +- lt_cv_deplibs_check_method=pass_all +- fi +- ;; +- +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- case $host_cpu in +- ia64*) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' +- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; +- hppa*64*) +- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + ;; +- esac +- ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-interix3*) +- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' +- ;; ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; ++ output_verbose_link_cmd='echo' + +-# This must be Linux ELF. +-linux*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + +-netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +- else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +- fi +- ;; ++ # The C++ compiler must be used to create the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | grep -v '^2\.7' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown +- ;; +- +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' +- else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +- fi +- ;; +- +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ fi + +-sysv4 | sysv4.3*) +- case $host_vendor in +- motorola) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac + ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- pc) +- lt_cv_deplibs_check_method=pass_all ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- esac +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; + esac +-]) +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD +- +- +-# AC_PROG_NM +-# ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- lt_nm_to_check="${ac_tool_prefix}nm" +- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then +- lt_nm_to_check="$lt_nm_to_check nm" +- fi +- for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" +- break +- ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; +- esac +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" +- done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM +- ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-# AC_CHECK_LIBM +-# ------------- +-# check for math library +-AC_DEFUN([AC_CHECK_LIBM], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case $host in +-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +- # These system don't have libm, or don't need it +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, cos, LIBM="-lm") +- ;; +-esac +-])# AC_CHECK_LIBM ++_LT_AC_TAGVAR(GCC, $1)="$GXX" ++_LT_AC_TAGVAR(LD, $1)="$LD" + ++AC_LIBTOOL_POSTDEP_PREDEP($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +-# (note the single quotes!). If your package is not flat and you're not +-# using automake, define top_builddir and top_srcdir appropriately in +-# the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE ++AC_LIBTOOL_CONFIG($1) + ++AC_LANG_POP ++CC=$lt_save_CC ++LDCXX=$LD ++LD=$lt_save_LD ++GCC=$lt_save_GCC ++with_gnu_ldcxx=$with_gnu_ld ++with_gnu_ld=$lt_save_with_gnu_ld ++lt_cv_path_LDCXX=$lt_cv_path_LD ++lt_cv_path_LD=$lt_save_path_LD ++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++])# AC_LIBTOOL_LANG_CXX_CONFIG + +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl installable library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# and an installed libltdl is not found, it is assumed to be `libltdl'. +-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and top_srcdir +-# appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE ++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++# ------------------------------------ ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext </dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_PROG_CXXCPP +-fi +-])# _LT_AC_PROG_CXXCPP ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then ++ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; + +-# AC_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi + ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then ++ _LT_AC_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then ++ _LT_AC_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; + +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 ++ *) ;; # Ignore the rest. + ++ esac ++ done + +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling $1 test program" ++fi + ++$rm -f confest.$objext + +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++interix[[3-9]]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_AC_TAGVAR(predep_objects,$1)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= ++ ;; + ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ # ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; + +-# AC_LIBTOOL_RC +-# ------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC ++solaris*) ++ case $cc_basename in ++ CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac + ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++]) + +-# AC_LIBTOOL_LANG_C_CONFIG +-# ------------------------ ++case " $_LT_AC_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++])# AC_LIBTOOL_POSTDEP_PREDEP ++ ++# AC_LIBTOOL_LANG_F77_CONFIG ++# -------------------------- + # Ensure that the configuration vars for the C compiler are + # suitably defined. Those variables are subsequently used by + # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c ++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) ++AC_DEFUN([_LT_AC_LANG_F77_CONFIG], ++[AC_REQUIRE([AC_PROG_F77]) ++AC_LANG_PUSH(Fortran 77) + +-# Object file extension for compiled C test sources. ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for f77 test sources. ++ac_ext=f ++ ++# Object file extension for compiled f77 test sources. + objext=o + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' ++lt_simple_link_test_code="\ ++ program t ++ end ++" + ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${F77-"f77"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +-# Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + +@@ -4972,12 +4531,11 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +- + aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +- ;; ++ ;; + esac + AC_MSG_RESULT([$enable_shared]) + +@@ -4986,63 +4544,44 @@ + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + ++_LT_AC_TAGVAR(GCC, $1)="$G77" ++_LT_AC_TAGVAR(LD, $1)="$LD" ++ ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++ + AC_LIBTOOL_CONFIG($1) + + AC_LANG_POP + CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG ++])# AC_LIBTOOL_LANG_F77_CONFIG + + +-# AC_LIBTOOL_LANG_CXX_CONFIG ++# AC_LIBTOOL_LANG_GCJ_CONFIG + # -------------------------- + # Ensure that the configuration vars for the C compiler are + # suitably defined. Those variables are subsequently used by + # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) ++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], ++[AC_LANG_SAVE + +-# Source file extension for C++ test sources. +-ac_ext=cpp ++# Source file extension for Java test sources. ++ac_ext=java + +-# Object file extension for compiled C++ test sources. ++# Object file extension for compiled Java test sources. + objext=o + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="class foo {}" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER +@@ -5052,2046 +4591,812 @@ + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $as_unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} ++lt_save_CC="$CC" ++CC=${GCJ-"gcj"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +- AC_PROG_LD ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++AC_LIBTOOL_CONFIG($1) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_GCJ_CONFIG + +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' + +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- with_gnu_ld=no +- wlarc= ++# AC_LIBTOOL_LANG_RC_CONFIG ++# ------------------------- ++# Ensure that the configuration vars for the Windows resource compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) ++AC_DEFUN([_LT_AC_LANG_RC_CONFIG], ++[AC_LANG_SAVE + +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi ++# Source file extension for RC test sources. ++ac_ext=rc + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi ++# Code to be used in simple compile tests ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no ++# Code to be used in simple link tests ++lt_simple_link_test_code="$lt_simple_compile_test_code" + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${RC-"windres"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++AC_LIBTOOL_CONFIG($1) + +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_RC_CONFIG + +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# AC_LIBTOOL_CONFIG([TAGNAME]) ++# ---------------------------- ++# If TAGNAME is not passed, then create an initial libtool script ++# with a default configuration from the untagged config vars. Otherwise ++# add code to config.status for appending the configuration named by ++# TAGNAME from the matching tagged config vars. ++AC_DEFUN([AC_LIBTOOL_CONFIG], ++[# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # See if we are running on zsh, and set the options which allow our commands through ++ # without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ _LT_AC_TAGVAR(compiler, $1) \ ++ _LT_AC_TAGVAR(CC, $1) \ ++ _LT_AC_TAGVAR(LD, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ ++ _LT_AC_TAGVAR(old_archive_cmds, $1) \ ++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ ++ _LT_AC_TAGVAR(predep_objects, $1) \ ++ _LT_AC_TAGVAR(postdep_objects, $1) \ ++ _LT_AC_TAGVAR(predeps, $1) \ ++ _LT_AC_TAGVAR(postdeps, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(archive_cmds, $1) \ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ ++ _LT_AC_TAGVAR(postinstall_cmds, $1) \ ++ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ ++ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ ++ _LT_AC_TAGVAR(no_undefined_flag, $1) \ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ ++ _LT_AC_TAGVAR(hardcode_automatic, $1) \ ++ _LT_AC_TAGVAR(module_cmds, $1) \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ ++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ ++ _LT_AC_TAGVAR(exclude_expsyms, $1) \ ++ _LT_AC_TAGVAR(include_expsyms, $1); do + +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++ case $var in ++ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ ++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ ++ _LT_AC_TAGVAR(archive_cmds, $1) | \ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; + esac ++ done ++ ++ case $lt_echo in ++ *'\[$]0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` + ;; ++ esac + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ifelse([$1], [], ++ [cfgfile="${ofile}T" ++ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 ++ $rm -f "$cfgfile" ++ AC_MSG_NOTICE([creating $ofile])], ++ [cfgfile="$ofile"]) + +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ cat <<__EOF__ >> "$cfgfile" ++ifelse([$1], [], ++[#! $SHELL + +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; ++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ++# Free Software Foundation, Inc. ++# ++# This file is part of GNU Libtool: ++# Originally by Gordon Matzigkeit , 1996 ++# ++# 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. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- freebsd[[12]]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- freebsd-elf*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. ++# A sed program that does not truncate output. ++SED=$lt_SED + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="$SED -e 1s/^X//" + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- ;; +- *) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++# The names of the tagged configurations supported by this script. ++available_tags= + +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++# ### BEGIN LIBTOOL CONFIG], ++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL + +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc*) +- # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- pgCC*) +- # Portland Group C++ compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++# Whether or not to build static libraries. ++build_old_libs=$enable_static + +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- fi +- output_verbose_link_cmd='echo' +- ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os + +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++# An echo program that does not interpret backslashes. ++echo=$lt_echo + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++# A C compiler. ++LTCC=$lt_LTCC + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++# A language-specific compiler. ++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++# Is the compiler the GNU C compiler? ++with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++# An ERE matcher. ++EGREP=$lt_EGREP + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# The linker used to build libraries. ++LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ +- $rm $lib.exp' ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# A BSD-compatible nm program. ++NM=$lt_NM + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++# A symbol stripping program ++STRIP=$lt_STRIP + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" + +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' +- ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++# Used on cygwin: assembler. ++AS="$AS" + +- output_verbose_link_cmd='echo' ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir + +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds + +- # The C++ compiler must be used to create the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# How to pass a linker flag through the compiler. ++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# Object file suffix (normally "o"). ++objext="$ac_objext" + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi ++# Old archive suffix (normally "a"). ++libext="$libext" + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- fi +- ;; +- esac +- ;; +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' + +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- # So that behaviour is only enabled if SCOABSPATH is set to a +- # non-empty value in the environment. Most likely only useful for +- # creating official distributions of packages. +- # This is a hack until libtool officially supports absolute path +- # names for shared libraries. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++# Executable file suffix (normally ""). ++exeext="$exeext" + +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +-esac +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++# Additional compiler flags for building library objects. ++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++pic_mode=$pic_mode + +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len + +-AC_LIBTOOL_POSTDEP_PREDEP($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +-AC_LIBTOOL_CONFIG($1) ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks + +-AC_LANG_POP +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# AC_LIBTOOL_LANG_CXX_CONFIG ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix + +-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------------------ +-# Figure out "hidden" library dependencies from verbose +-# compiler output when linking a shared library. +-# Parse the compiler output and extract the necessary +-# objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +-dnl we can't use the lt_simple_compile_test_code here, +-dnl because it contains code intended for an executable, +-dnl not a library. It's possible we should let each +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" + +-# AC_LIBTOOL_CONFIG([TAGNAME]) +-# ---------------------------- +-# If TAGNAME is not passed, then create an initial libtool script +-# with a default configuration from the untagged config vars. Otherwise +-# add code to config.status for appending the configuration named by +-# TAGNAME from the matching tagged config vars. +-AC_DEFUN([AC_LIBTOOL_CONFIG], +-[# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++EOF ++ ;; ++ esac ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || \ ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++]) ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" + fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- _LT_AC_TAGVAR(compiler, $1) \ +- _LT_AC_TAGVAR(CC, $1) \ +- _LT_AC_TAGVAR(LD, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ +- _LT_AC_TAGVAR(old_archive_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ +- _LT_AC_TAGVAR(predep_objects, $1) \ +- _LT_AC_TAGVAR(postdep_objects, $1) \ +- _LT_AC_TAGVAR(predeps, $1) \ +- _LT_AC_TAGVAR(postdeps, $1) \ +- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ +- _LT_AC_TAGVAR(archive_cmds, $1) \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(postinstall_cmds, $1) \ +- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ +- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ +- _LT_AC_TAGVAR(no_undefined_flag, $1) \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ +- _LT_AC_TAGVAR(hardcode_automatic, $1) \ +- _LT_AC_TAGVAR(module_cmds, $1) \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ +- _LT_AC_TAGVAR(exclude_expsyms, $1) \ +- _LT_AC_TAGVAR(include_expsyms, $1); do ++fi ++])# AC_LIBTOOL_CONFIG + +- case $var in +- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(module_cmds, $1) | \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done + +- case $lt_echo in +- *'\[$]0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` +- ;; +- esac ++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], ++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + +-ifelse([$1], [], +- [cfgfile="${ofile}T" +- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 +- $rm -f "$cfgfile" +- AC_MSG_NOTICE([creating $ofile])], +- [cfgfile="$ofile"]) ++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +- cat <<__EOF__ >> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL ++if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit , 1996 +-# +-# 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. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG], +-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ lt_cv_prog_compiler_rtti_exceptions, ++ [-fno-rtti -fno-exceptions], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++fi ++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL ++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++# --------------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], ++[AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_REQUIRE([LT_AC_PROG_SED]) ++AC_REQUIRE([AC_PROG_NM]) ++AC_REQUIRE([AC_OBJEXT]) ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++[ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared ++# Character class describing NM global symbol codes. ++symcode='[[BCDEGRST]]' + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) ++# Transform an extracted symbol line into a proper C declaration ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[[BCDT]]' ++ ;; ++cygwin* | mingw* | pw32*) ++ symcode='[[ABCDGISTW]]' ++ ;; ++hpux*) # Its linker distinguishes data from code symbols ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDEGRST]]' ++ fi ++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++ ;; ++linux* | k*bsd*-gnu) ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDGIRSTW]]' ++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[[BCDEGRST]]' ++ ;; ++osf*) ++ symcode='[[BCDEGQRST]]' ++ ;; ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' ++ ;; ++sysv4) ++ symcode='[[DFNSTU]]' ++ ;; ++esac + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[[ABCDGIRSTW]]' ;; ++esac + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo ++# Try without a prefix undercore, then with it. ++for ac_symprfx in "" "_"; do + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" + +-# A C compiler. +-LTCC=$lt_LTCC ++ # Write the raw and C identifiers. ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS ++ # Check to see that the pipe works correctly. ++ pipe_works=no + +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) ++ rm -f conftest* ++ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi + +-# An ERE matcher. +-EGREP=$lt_EGREP ++ # Make sure that we snagged all the symbols we need. ++ if grep ' nm_test_var$' "$nlist" >/dev/null; then ++ if grep ' nm_test_func$' "$nlist" >/dev/null; then ++ cat < conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif + +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) ++EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S ++ cat <> conftest.$ac_ext ++#if defined (__STDC__) && __STDC__ ++# define lt_ptr_t void * ++#else ++# define lt_ptr_t char * ++# define const ++#endif + +-# A BSD-compatible nm program. +-NM=$lt_NM ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ lt_ptr_t address; ++} ++lt_preloaded_symbols[[]] = ++{ ++EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++ cat <<\EOF >> conftest.$ac_ext ++ {0, (lt_ptr_t) 0} ++}; + +-# A symbol stripping program +-STRIP=$lt_STRIP ++#ifdef __cplusplus ++} ++#endif ++EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -f conftest* conftst* + +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS="$AS" +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++]) ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ AC_MSG_RESULT(failed) ++else ++ AC_MSG_RESULT(ok) ++fi ++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) ++# --------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], ++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) ++AC_MSG_CHECKING([for $compiler option to produce PIC]) ++ ifelse([$1],[CXX],[ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) +- +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) +- +-__EOF__ +- +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" +- +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF +- ;; +- esac +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-]) +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +-])# AC_LIBTOOL_CONFIG +- +- +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +- +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +- +-if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +- +- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], +- lt_cv_prog_compiler_rtti_exceptions, +- [-fno-rtti -fno-exceptions], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +-fi +-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI +- +- +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-# --------------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +-[AC_REQUIRE([AC_CANONICAL_HOST]) +-AC_REQUIRE([AC_PROG_NM]) +-AC_REQUIRE([AC_OBJEXT]) +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +-[ +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] +- +-# Character class describing NM global symbol codes. +-symcode='[[BCDEGRST]]' +- +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' +- +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" +- +-# Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[[BCDT]]' +- ;; +-cygwin* | mingw* | pw32*) +- symcode='[[ABCDGISTW]]' +- ;; +-hpux*) # Its linker distinguishes data from code symbols +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDEGRST]]' +- fi +- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- ;; +-linux*) +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDGIRSTW]]' +- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- fi +- ;; +-irix* | nonstopux*) +- symcode='[[BCDEGRST]]' +- ;; +-osf*) +- symcode='[[BCDEGQRST]]' +- ;; +-solaris*) +- symcode='[[BDRT]]' +- ;; +-sco3.2v5*) +- symcode='[[DT]]' +- ;; +-sysv4.2uw2*) +- symcode='[[DT]]' +- ;; +-sysv5* | sco5v6* | unixware* | OpenUNIX*) +- symcode='[[ABDT]]' +- ;; +-sysv4) +- symcode='[[DFNSTU]]' +- ;; +-esac +- +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac +- +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[[ABCDGIRSTW]]' ;; +-esac +- +-# Try without a prefix undercore, then with it. +-for ac_symprfx in "" "_"; do +- +- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. +- symxfrm="\\1 $ac_symprfx\\2 \\2" +- +- # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +- +- # Check to see that the pipe works correctly. +- pipe_works=no +- +- rm -f conftest* +- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi +- +- # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat < conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' +- +- cat <> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr_t address; +-} +-lt_preloaded_symbols[[]] = +-{ +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} +-}; +- +-#ifdef __cplusplus +-} +-#endif +-EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD +- cat conftest.$ac_ext >&5 +- fi +- rm -f conftest* conftst* +- +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done +-]) +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- AC_MSG_RESULT(failed) +-else +- AC_MSG_RESULT(ok) +-fi +-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +- +- +-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= +- +-AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ +- # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + amigaos*) +@@ -7100,12 +5405,14 @@ + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) +@@ -7117,7 +5424,7 @@ + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; +- interix3*) ++ interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -7183,7 +5490,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -7226,7 +5533,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -7253,6 +5560,14 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -7269,7 +5584,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -7351,1466 +5666,3549 @@ + ;; + esac + fi +-], +-[ +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ newsos6) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All Alpha code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ rdos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ solaris*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ ++ uts4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++]) ++ ++ ++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++# ------------------------------------ ++# See if the linker supports building shared libraries. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++ifelse([$1],[CXX],[ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ case $host_os in ++ aix4* | aix5*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ ;; ++ cygwin* | mingw*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ esac ++],[ ++ runpath_var= ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)= ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++ _LT_AC_TAGVAR(module_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ _LT_AC_TAGVAR(include_expsyms, $1)= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix3* | aix4* | aix5*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix[[3-9]]*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | k*bsd*-gnu) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ $echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; ++ ++ aix4* | aix5*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ # see comment about different semantics on the GNU ld section ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ bsdi[[45]]*) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ freebsd1*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ newsos6) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ os2*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ ++ solaris*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4.3*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ fi ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $rm conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; ++ esac ++ fi ++ ;; ++esac ++])# AC_LIBTOOL_PROG_LD_SHLIBS ++ ++ ++# _LT_AC_FILE_LTDLL_C ++# ------------------- ++# Be careful that the start marker always follows a newline. ++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++# /* ltdll.c starts here */ ++# #define WIN32_LEAN_AND_MEAN ++# #include ++# #undef WIN32_LEAN_AND_MEAN ++# #include ++# ++# #ifndef __CYGWIN__ ++# # ifdef __CYGWIN32__ ++# # define __CYGWIN__ __CYGWIN32__ ++# # endif ++# #endif ++# ++# #ifdef __cplusplus ++# extern "C" { ++# #endif ++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++# #ifdef __cplusplus ++# } ++# #endif ++# ++# #ifdef __CYGWIN__ ++# #include ++# DECLARE_CYGWIN_DLL( DllMain ); ++# #endif ++# HINSTANCE __hDllInstance_base; ++# ++# BOOL APIENTRY ++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++# { ++# __hDllInstance_base = hInst; ++# return TRUE; ++# } ++# /* ltdll.c ends here */ ++])# _LT_AC_FILE_LTDLL_C ++ ++ ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) ++ ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) ++]) ++ ++AC_DEFUN([LT_AC_PROG_RC], ++[AC_CHECK_TOOL(RC, windres, no) ++]) ++ ++ ++# Cheap backport of AS_EXECUTABLE_P and required macros ++# from Autoconf 2.59; we should not use $as_executable_p directly. ++ ++# _AS_TEST_PREPARE ++# ---------------- ++m4_ifndef([_AS_TEST_PREPARE], ++[m4_defun([_AS_TEST_PREPARE], ++[if test -x / >/dev/null 2>&1; then ++ as_executable_p='test -x' ++else ++ as_executable_p='test -f' ++fi ++])])# _AS_TEST_PREPARE ++ ++# AS_EXECUTABLE_P ++# --------------- ++# Check whether a file is executable. ++m4_ifndef([AS_EXECUTABLE_P], ++[m4_defun([AS_EXECUTABLE_P], ++[AS_REQUIRE([_AS_TEST_PREPARE])dnl ++$as_executable_p $1[]dnl ++])])# AS_EXECUTABLE_P ++ ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_SED. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done ++ done ++done ++IFS=$as_save_IFS ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++]) ++ ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) ++ ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) ++ ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) ++ ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) ++ ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) ++else ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) ++fi ++ ++GNOME_DOC_DEFINES ++]) ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES ++ ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# This macro actually does too much some checks are only needed if ++# your package does certain things. But this isn't really a big deal. ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 10 ++ ++AC_PREREQ([2.54]) ++ ++# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow ++# the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++ ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++ AC_REQUIRE([AC_PROG_INSTALL])dnl ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) ++ ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_MISSING_PROG(AMTAR, tar) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++ ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++]) ++]) ++ ++ ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright 2002 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION so it can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++ [AM_AUTOMAKE_VERSION([1.7.9])]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright 2001, 2002 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 2 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# ++# Check to make sure that the build environment is sane. ++# ++ ++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 3 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# -*- Autoconf -*- ++ ++ ++# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 3 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# AM_AUX_DIR_EXPAND ++ ++# Copyright 2001 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++# Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50]) ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], [ ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++ ++# Copyright 2001 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# AM_PROG_INSTALL_STRIP ++ ++# Copyright 2001 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ ++# -*- Autoconf -*- ++# Copyright (C) 2003 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 1 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ ++# serial 5 -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++ ++# 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, 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++ ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ ++ ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ : > sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break + fi + ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; + +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' +- ;; ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; + +- interix3*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking Speeds up one-time builds ++ --enable-dependency-tracking Do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH]) ++]) + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- enable_shared=no +- ;; ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; ++# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; ++# 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, or (at your option) ++# any later version. + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; ++# 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. + +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' +- ;; ++# 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. + +- hpux9* | hpux10* | hpux11*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- ;; ++#serial 2 + +- irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES from the Makefile without ++ # running `make'. ++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n -e '/^U = / s///p' < "$mf"` ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # We invoke sed twice because it is the simplest approach to ++ # changing $(DEPDIR) to its actual value in the expansion. ++ for file in `sed -n -e ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; + +- linux*) +- case $cc_basename in +- icc* | ecc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- ccc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All Alpha code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- esac +- ;; ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +- osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +- solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +- esac +- ;; ++# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +- sunos4*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# 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, or (at your option) ++# any later version. + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# 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. + +- sysv4*MP*) +- if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; ++# 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# serial 2 + +- unicos*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) + +- uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then +- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), +- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +- ;; +-esac ++# 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, or (at your option) ++# any later version. + +-# +-# Check to make sure the static flag actually works. +-# +-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $lt_tmp_static_flag, +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +-]) ++# 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. + +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ +-# See if the linker supports building shared libraries. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-ifelse([$1],[CXX],[ +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- case $host_os in +- aix4* | aix5*) +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- ;; +- pw32*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; +- cygwin* | mingw*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- *) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- esac +-],[ +- runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_AC_TAGVAR(hardcode_automatic, $1)=no +- _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- _LT_CC_BASENAME([$compiler]) +- case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac ++AC_PREREQ([2.52]) ++ ++# serial 6 + +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac ++# Add --enable-maintainer-mode option to configure. ++# From Jim Meyering + +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix3* | aix4* | aix5*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. ++# 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, or (at your option) ++# any later version. + +-EOF +- fi +- ;; ++# 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. + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++# 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. + +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# serial 2 + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; + +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; ++# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +- linux*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- tmp_addflag= +- case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++# 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, or (at your option) ++# any later version. + +- if test $supports_anon_versioning = yes; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# 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. + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; ++# 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., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 3 ++ ++AC_PREREQ(2.50) ++ ++# AM_PROG_LEX ++# ----------- ++# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a ++# "missing" invocation, for better error output. ++AC_DEFUN([AM_PROG_LEX], ++[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl ++AC_REQUIRE([AC_PROG_LEX])dnl ++if test "$LEX" = :; then ++ LEX=${am_missing_run}flex ++fi]) ++ ++ ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 36 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi + +- solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++IT_PO_SUBDIR([po]) + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) ++dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++AC_CONFIG_COMMANDS([intltool], [ + +-_LT_EOF +- ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out ++ else ++ mv -f ${file}.out ${file} ++ fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done + +- sunos4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac ++]) + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then +- runpath_var= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) + fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- fi +- ;; ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) + +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. ++# ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 ++# ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 ++# ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 ++# ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 ++# ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +- if test "$GCC" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break + fi +- ;; ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) ++else ++ AC_MSG_RESULT(no) ++fi ++AC_SUBST($1)dnl ++]) + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ USE_NLS=yes ++ AC_SUBST(USE_NLS) + +- bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; ++ gt_cv_have_gettext=no + +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' +- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- ;; ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +- dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ fi + +- freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi + +- hpux9*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" + fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ fi + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- fi +- ;; ++ # We need to process the po/ directory. ++ POSUB=po + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- fi +- ;; ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +- newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi + +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- ;; ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + +- os2*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +- osf3*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) + +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + +- # Both c and cxx compiler support -rpath directly +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +- solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- wlarc='' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; +- *) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Configure paths for GLIB ++# Owen Taylor 1997-2001 + +- sysv4) +- case $host_vendor in +- sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- ;; +- motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +- ;; ++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or ++dnl gthread is specified in MODULES, pass to pkg-config ++dnl ++AC_DEFUN([AM_PATH_GLIB_2_0], ++[dnl ++dnl Get the cflags and libraries from pkg-config ++dnl ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ pkg_config_args=glib-2.0 ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; + esac +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ done + +- sysv4.3*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' +- ;; ++ PKG_PROG_PKG_CONFIG([0.16]) + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- fi +- ;; ++ no_glib="" + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no ++ fi + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++ min_glib_version=ifelse([$1], ,2.0.0,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi + +- uts4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of pkg-config to some extent) ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include ++#include ++#include + +-# +-# Do we need to explicitly link libc? +-# +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +-x|xyes) +- # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; + +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ system ("touch conf.glibtest"); + +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) +- ;; +- esac ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) + fi +- ;; +-esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS +- +- +-# _LT_AC_FILE_LTDLL_C +-# ------------------- +-# Be careful that the start marker always follows a newline. +-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +-# /* ltdll.c starts here */ +-# #define WIN32_LEAN_AND_MEAN +-# #include +-# #undef WIN32_LEAN_AND_MEAN +-# #include +-# +-# #ifndef __CYGWIN__ +-# # ifdef __CYGWIN32__ +-# # define __CYGWIN__ __CYGWIN32__ +-# # endif +-# #endif +-# +-# #ifdef __cplusplus +-# extern "C" { +-# #endif +-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +-# #ifdef __cplusplus +-# } +-# #endif +-# +-# #ifdef __CYGWIN__ +-# #include +-# DECLARE_CYGWIN_DLL( DllMain ); +-# #endif +-# HINSTANCE __hDllInstance_base; +-# +-# BOOL APIENTRY +-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +-# { +-# __hDllInstance_base = hInst; +-# return TRUE; +-# } +-# /* ltdll.c ends here */ +-])# _LT_AC_FILE_LTDLL_C +- +- +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) +- +- +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) +- +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) +- +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest + ]) + +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) ++dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS ++dnl ++AC_DEFUN([AM_PATH_ORBIT2], ++[dnl ++dnl Get the cflags and libraries from the orbit2-config script ++dnl ++AC_ARG_WITH(orbit-prefix,[ --with-orbit-prefix=PFX Prefix where ORBIT is installed (optional)], ++ orbit_config_prefix="$withval", orbit_config_prefix="") ++AC_ARG_WITH(orbit-exec-prefix,[ --with-orbit-exec-prefix=PFX Exec prefix where ORBIT is installed (optional)], ++ orbit_config_exec_prefix="$withval", orbit_config_exec_prefix="") ++AC_ARG_ENABLE(orbittest, [ --disable-orbittest Do not try to compile and run a test ORBIT program], ++ , enable_orbittest=yes) + +-# NOTE: This macro has been submitted for inclusion into # +-# GNU Autoconf as AC_PROG_SED. When it is available in # +-# a released version of Autoconf we should remove this # +-# macro and use it instead. # +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], +-[AC_MSG_CHECKING([for a sed that does not truncate output]) +-AC_CACHE_VAL(lt_cv_path_SED, +-[# Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for lt_ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi +- done ++ for module in . $4 ++ do ++ case "$module" in ++ server) ++ orbit_config_args="$orbit_config_args server" ++ ;; ++ client) ++ orbit_config_args="$orbit_config_args client" ++ ;; ++ esac + done +-done +-lt_ac_max=0 +-lt_ac_count=0 +-# Add /usr/xpg4/bin/sed as it is typically found on Solaris +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break ++ if test x$orbit_config_args = x ; then ++ orbit_config_args=server + fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +-]) +-SED=$lt_cv_path_SED +-AC_MSG_RESULT([$SED]) +-]) +- +-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# +-# Copyright © 2004 Scott James Remnant . +-# +-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +-# ---------------------------------- +-AC_DEFUN([PKG_PROG_PKG_CONFIG], +-[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG +- +-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# +-# Check to see whether a particular set of modules exists. Similar +-# to PKG_CHECK_MODULES(), but does not set variables or print errors. +-# +-# +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_EXISTS], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-if test -n "$PKG_CONFIG" && \ +- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) +-m4_ifvaln([$3], [else +- $3])dnl +-fi]) + ++ if test x$orbit_config_exec_prefix != x ; then ++ orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix" ++ if test x${ORBIT_CONFIG+set} != xset ; then ++ ORBIT_CONFIG=$orbit_config_exec_prefix/bin/orbit2-config ++ fi ++ fi ++ if test x$orbit_config_prefix != x ; then ++ orbit_config_args="$orbit_config_args --prefix=$orbit_config_prefix" ++ if test x${ORBIT_CONFIG+set} != xset ; then ++ ORBIT_CONFIG=$orbit_config_prefix/bin/orbit2-config ++ fi ++ fi + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no) ++ min_orbit_version=ifelse([$1], , 2.3.0, $1) ++ AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version) ++ no_orbit="" ++ if test "$ORBIT_CONFIG" = "no" ; then ++ if test "$PKG_CONFIG" = "no" ; then ++ no_orbit=yes + else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) ++ ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0` ++ ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0` + fi +-else +- pkg_failed=untried +-fi[]dnl +-])# _PKG_CONFIG ++ else ++ ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags` ++ ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs` ++ fi + +-# _PKG_SHORT_ERRORS_SUPPORTED +-# ----------------------------- +-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi[]dnl +-])# _PKG_SHORT_ERRORS_SUPPORTED ++ if test "x$no_orbit" = x ; then ++ ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0` + ++ orbit_config_major_version=`echo $ORBIT_VERSION | \ ++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ orbit_config_minor_version=`echo $ORBIT_VERSION | \ ++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ orbit_config_micro_version=`echo $ORBIT_VERSION | \ ++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_orbittest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $ORBIT_CFLAGS" ++ LIBS="$ORBIT_LIBS $LIBS" ++dnl ++dnl Now check if the installed ORBIT is sufficiently new. (Also sanity ++dnl checks the results of orbit2-config to some extent ++dnl ++ rm -f conf.orbittest ++ AC_TRY_RUN([ ++#include ++#include ++#include + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# +-# +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++ system ("touch conf.orbittest"); + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_orbit_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_orbit_version"); ++ exit(1); ++ } + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) ++ if ((orbit_major_version != $orbit_config_major_version) || ++ (orbit_minor_version != $orbit_config_minor_version) || ++ (orbit_micro_version != $orbit_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --version ORBit-2.0' returned %d.%d.%d, but ORBit (%d.%d.%d)\n", ++ $orbit_config_major_version, $orbit_config_minor_version, $orbit_config_micro_version, ++ orbit_major_version, orbit_minor_version, orbit_micro_version); ++ printf ("*** was found! If orbit2-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of ORBit. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If orbit2-config was wrong, set the environment variable ORBIT_CONFIG\n"); ++ printf("*** to point to the correct copy of orbit2-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++#if defined (ORBIT_MAJOR_VERSION) && defined (ORBIT_MINOR_VERSION) && defined (ORBIT_MICRO_VERSION) ++ else if ((orbit_major_version != ORBIT_MAJOR_VERSION) || ++ (orbit_minor_version != ORBIT_MINOR_VERSION) || ++ (orbit_micro_version != ORBIT_MICRO_VERSION)) ++ { ++ printf("*** ORBit header files (version %d.%d.%d) do not match\n", ++ ORBIT_MAJOR_VERSION, ORBIT_MINOR_VERSION, ORBIT_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ orbit_major_version, orbit_minor_version, orbit_micro_version); ++ } ++#endif /* defined (ORBIT_MAJOR_VERSION) ... */ ++ else ++ { ++ if ((orbit_major_version > major) || ++ ((orbit_major_version == major) && (orbit_minor_version > minor)) || ++ ((orbit_major_version == major) && (orbit_minor_version == minor) && (orbit_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of ORBit (%d.%d.%d) was found.\n", ++ orbit_major_version, orbit_minor_version, orbit_micro_version); ++ printf("*** You need a version of ORBit newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** ORBit is always available from ftp://ftp.orbit.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the orbit2-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of ORBit, but you can also set the ORBIT_CONFIG environment to point to the\n"); ++ printf("*** correct copy of orbit2-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_orbit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_orbit" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$ORBIT_CONFIG" = "no" ; then ++ echo "*** The orbit2-config script installed by ORBIT could not be found" ++ echo "*** If ORBit was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the ORBIT_CONFIG environment variable to the" ++ echo "*** full path to orbit2-config." ++ else ++ if test -f conf.orbittest ; then ++ : ++ else ++ echo "*** Could not run ORBIT test program, checking why..." ++ CFLAGS="$CFLAGS $ORBIT_CFLAGS" ++ LIBS="$LIBS $ORBIT_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((orbit_major_version) || (orbit_minor_version) || (orbit_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding ORBit or finding the wrong" ++ echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the ORBit package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps orbit orbit-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means ORBIT was incorrectly installed" ++ echo "*** or that you have moved ORBit since it was installed. In the latter case, you" ++ echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ ORBIT_CFLAGS="" ++ ORBIT_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi + +-if test $pkg_failed = yes; then +- _PKG_SHORT_ERRORS_SUPPORTED +- if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, ifelse([$3], , :, [$3])) ++ AC_SUBST(ORBIT_CFLAGS) ++ AC_SUBST(ORBIT_LIBS) ++ AC_SUBST(ORBIT_IDL) ++ rm -f conf.orbittest ++]) + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-$$1_PKG_ERRORS ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + +-_PKG_TEXT +-])], +- [$4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-_PKG_TEXT ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-To get pkg-config, see .])], +- [$4]) +-else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ [ --disable-schemas-install Disable the schemas installation], ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) + +-m4_include([acinclude.m4]) +diff -ruN evolution-2.12.2.orig/aclocal.m4~ evolution-2.12.2/aclocal.m4~ +--- evolution-2.12.2.orig/aclocal.m4~ 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.12.2/aclocal.m4~ 2007-11-26 04:31:44.000000000 +0100 +@@ -0,0 +1,8816 @@ ++# generated automatically by aclocal 1.10 -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++m4_if(m4_PACKAGE_VERSION, [2.61],, ++[m4_fatal([this file was generated for autoconf 2.61. ++You have another version of autoconf. If you want to use that, ++you should regenerate the build system entirely.], [63])]) ++ ++# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.10])dnl ++_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) ++ ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 9 ++ ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) ++ ++ ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) ++ ++ ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) ++ ++# Generate code to set up dependency tracking. -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++#serial 3 ++ ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ++ ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 12 ++ ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. ++ ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.60])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) ++ ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++]) ++ ++ ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ ++# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 5 ++ ++# AM_PROG_LEX ++# ----------- ++# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a ++# "missing" invocation, for better error output. ++AC_DEFUN([AM_PROG_LEX], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AM_MISSING_HAS_RUN])dnl ++AC_REQUIRE([AC_PROG_LEX])dnl ++if test "$LEX" = :; then ++ LEX=${am_missing_run}flex ++fi]) ++ ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++ ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 5 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ ++# Check how to create a tarball. -*- Autoconf -*- ++ ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR ++ ++dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS ++dnl ++AC_DEFUN([AM_PATH_ORBIT2], ++[dnl ++dnl Get the cflags and libraries from the orbit2-config script ++dnl ++AC_ARG_WITH(orbit-prefix,[ --with-orbit-prefix=PFX Prefix where ORBIT is installed (optional)], ++ orbit_config_prefix="$withval", orbit_config_prefix="") ++AC_ARG_WITH(orbit-exec-prefix,[ --with-orbit-exec-prefix=PFX Exec prefix where ORBIT is installed (optional)], ++ orbit_config_exec_prefix="$withval", orbit_config_exec_prefix="") ++AC_ARG_ENABLE(orbittest, [ --disable-orbittest Do not try to compile and run a test ORBIT program], ++ , enable_orbittest=yes) ++ ++ for module in . $4 ++ do ++ case "$module" in ++ server) ++ orbit_config_args="$orbit_config_args server" ++ ;; ++ client) ++ orbit_config_args="$orbit_config_args client" ++ ;; ++ esac ++ done ++ if test x$orbit_config_args = x ; then ++ orbit_config_args=server ++ fi ++ ++ if test x$orbit_config_exec_prefix != x ; then ++ orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix" ++ if test x${ORBIT_CONFIG+set} != xset ; then ++ ORBIT_CONFIG=$orbit_config_exec_prefix/bin/orbit2-config ++ fi ++ fi ++ if test x$orbit_config_prefix != x ; then ++ orbit_config_args="$orbit_config_args --prefix=$orbit_config_prefix" ++ if test x${ORBIT_CONFIG+set} != xset ; then ++ ORBIT_CONFIG=$orbit_config_prefix/bin/orbit2-config ++ fi ++ fi ++ ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no) ++ min_orbit_version=ifelse([$1], , 2.3.0, $1) ++ AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version) ++ no_orbit="" ++ if test "$ORBIT_CONFIG" = "no" ; then ++ if test "$PKG_CONFIG" = "no" ; then ++ no_orbit=yes ++ else ++ ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0` ++ ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0` ++ fi ++ else ++ ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags` ++ ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs` ++ fi ++ ++ if test "x$no_orbit" = x ; then ++ ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0` ++ ++ orbit_config_major_version=`echo $ORBIT_VERSION | \ ++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ orbit_config_minor_version=`echo $ORBIT_VERSION | \ ++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ orbit_config_micro_version=`echo $ORBIT_VERSION | \ ++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_orbittest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $ORBIT_CFLAGS" ++ LIBS="$ORBIT_LIBS $LIBS" ++dnl ++dnl Now check if the installed ORBIT is sufficiently new. (Also sanity ++dnl checks the results of orbit2-config to some extent ++dnl ++ rm -f conf.orbittest ++ AC_TRY_RUN([ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.orbittest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_orbit_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_orbit_version"); ++ exit(1); ++ } ++ ++ if ((orbit_major_version != $orbit_config_major_version) || ++ (orbit_minor_version != $orbit_config_minor_version) || ++ (orbit_micro_version != $orbit_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --version ORBit-2.0' returned %d.%d.%d, but ORBit (%d.%d.%d)\n", ++ $orbit_config_major_version, $orbit_config_minor_version, $orbit_config_micro_version, ++ orbit_major_version, orbit_minor_version, orbit_micro_version); ++ printf ("*** was found! If orbit2-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of ORBit. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If orbit2-config was wrong, set the environment variable ORBIT_CONFIG\n"); ++ printf("*** to point to the correct copy of orbit2-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++#if defined (ORBIT_MAJOR_VERSION) && defined (ORBIT_MINOR_VERSION) && defined (ORBIT_MICRO_VERSION) ++ else if ((orbit_major_version != ORBIT_MAJOR_VERSION) || ++ (orbit_minor_version != ORBIT_MINOR_VERSION) || ++ (orbit_micro_version != ORBIT_MICRO_VERSION)) ++ { ++ printf("*** ORBit header files (version %d.%d.%d) do not match\n", ++ ORBIT_MAJOR_VERSION, ORBIT_MINOR_VERSION, ORBIT_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ orbit_major_version, orbit_minor_version, orbit_micro_version); ++ } ++#endif /* defined (ORBIT_MAJOR_VERSION) ... */ ++ else ++ { ++ if ((orbit_major_version > major) || ++ ((orbit_major_version == major) && (orbit_minor_version > minor)) || ++ ((orbit_major_version == major) && (orbit_minor_version == minor) && (orbit_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of ORBit (%d.%d.%d) was found.\n", ++ orbit_major_version, orbit_minor_version, orbit_micro_version); ++ printf("*** You need a version of ORBit newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** ORBit is always available from ftp://ftp.orbit.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the orbit2-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of ORBit, but you can also set the ORBIT_CONFIG environment to point to the\n"); ++ printf("*** correct copy of orbit2-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_orbit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_orbit" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$ORBIT_CONFIG" = "no" ; then ++ echo "*** The orbit2-config script installed by ORBIT could not be found" ++ echo "*** If ORBit was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the ORBIT_CONFIG environment variable to the" ++ echo "*** full path to orbit2-config." ++ else ++ if test -f conf.orbittest ; then ++ : ++ else ++ echo "*** Could not run ORBIT test program, checking why..." ++ CFLAGS="$CFLAGS $ORBIT_CFLAGS" ++ LIBS="$LIBS $ORBIT_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((orbit_major_version) || (orbit_minor_version) || (orbit_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding ORBit or finding the wrong" ++ echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the ORBit package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps orbit orbit-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means ORBIT was incorrectly installed" ++ echo "*** or that you have moved ORBit since it was installed. In the latter case, you" ++ echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ ORBIT_CFLAGS="" ++ ORBIT_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ ++ AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, ifelse([$3], , :, [$3])) ++ AC_SUBST(ORBIT_CFLAGS) ++ AC_SUBST(ORBIT_LIBS) ++ AC_SUBST(ORBIT_IDL) ++ rm -f conf.orbittest ++]) ++ ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl ++ ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi ++ ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) ++ ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++ ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ [ --disable-schemas-install Disable the schemas installation], ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++ ++# Configure paths for GLIB ++# Owen Taylor 1997-2001 ++ ++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or ++dnl gthread is specified in MODULES, pass to pkg-config ++dnl ++AC_DEFUN([AM_PATH_GLIB_2_0], ++[dnl ++dnl Get the cflags and libraries from pkg-config ++dnl ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ pkg_config_args=glib-2.0 ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ esac ++ done ++ ++ PKG_PROG_PKG_CONFIG([0.16]) ++ ++ no_glib="" ++ ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no ++ fi ++ ++ min_glib_version=ifelse([$1], ,2.0.0,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++ ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi ++ ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi ++ ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` ++ ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of pkg-config to some extent) ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest ++]) ++ ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. ++# ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. ++# ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. ++# ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 ++# ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 ++# ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 ++# ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 ++# ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) ++ ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl ++ ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) ++else ++ AC_MSG_RESULT(no) ++fi ++AC_SUBST($1)dnl ++]) ++ ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ USE_NLS=yes ++ AC_SUBST(USE_NLS) ++ ++ gt_cv_have_gettext=no ++ ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= ++ ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" ++ ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ fi ++ ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) ++ ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" ++ ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi ++ ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) ++ ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi ++ ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi ++ ++ # We need to process the po/ directory. ++ POSUB=po ++ ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) ++ ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done ++ ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) ++ ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi ++ ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi ++ ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) ++ ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) ++ ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) ++ ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl ++ ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) ++ ++ ++dnl GNOME_COMPILE_WARNINGS ++dnl Turn on many useful compiler warnings ++dnl For now, only works on GCC ++AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ++ dnl ****************************** ++ dnl More compiler warnings ++ dnl ****************************** ++ ++ AC_ARG_ENABLE(compile-warnings, ++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], ++ [Turn on compiler warnings]),, ++ [enable_compile_warnings="m4_default([$1],[yes])"]) ++ ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi ++ ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" ++ ++ case "$enable_compile_warnings" in ++ no) ++ warning_flags= ++ ;; ++ minimum) ++ warning_flags="-Wall" ++ ;; ++ yes) ++ warning_flags="-Wall -Wmissing-prototypes" ++ ;; ++ maximum|error) ++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" ++ CFLAGS="$warning_flags $CFLAGS" ++ for option in -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ AC_MSG_CHECKING([whether gcc understands $option]) ++ AC_TRY_COMPILE([], [], ++ has_option=yes, ++ has_option=no,) ++ CFLAGS="$SAVE_CFLAGS" ++ AC_MSG_RESULT($has_option) ++ if test $has_option = yes; then ++ warning_flags="$warning_flags $option" ++ fi ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++ if test "$enable_compile_warnings" = "error" ; then ++ warning_flags="$warning_flags -Werror" ++ fi ++ ;; ++ *) ++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ++ ;; ++ esac ++ CFLAGS="$realsave_CFLAGS" ++ AC_MSG_CHECKING(what warning flags to pass to the C compiler) ++ AC_MSG_RESULT($warning_flags) ++ ++ AC_ARG_ENABLE(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) ++ ++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) ++ complCFLAGS= ++ if test "x$enable_iso_c" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -ansi" ;; ++ esac ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCFLAGS) ++ ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) ++]) ++ ++dnl For C++, do basically the same thing. ++ ++AC_DEFUN([GNOME_CXX_WARNINGS],[ ++ AC_ARG_ENABLE(cxx-warnings, ++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] ++ [Turn on compiler warnings.]),, ++ [enable_cxx_warnings="m4_default([$1],[minimum])"]) ++ ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GXX" != xyes; then ++ enable_cxx_warnings=no ++ fi ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac ++ ++ ## -W is not all that useful. And it cannot be controlled ++ ## with individual -Wno-xxx flags, unlike -Wall ++ if test "x$enable_cxx_warnings" = "xyes"; then ++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ fi ++ fi ++ fi ++ AC_MSG_RESULT($warnCXXFLAGS) ++ ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) ++ ++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac ++ ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCXXFLAGS) ++ ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) ++]) ++ ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) ++ ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) ++ ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) ++ ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) ++ ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) ++else ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) ++fi ++ ++GNOME_DOC_DEFINES ++]) ++ ++ ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 36 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) ++ ++IT_PO_SUBDIR([po]) ++ ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) ++dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. ++ ++AC_CONFIG_COMMANDS([intltool], [ ++ ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out ++ else ++ mv -f ${file}.out ${file} ++ fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done ++ ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) ++ ++]) ++ ++ ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) ++ ++ ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) ++ ++ ++# isc-posix.m4 serial 2 (gettext-0.11.2) ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. ++ ++# This test replaces the one in autoconf. ++# Currently this macro should have the same name as the autoconf macro ++# because gettext's gettext.m4 (distributed in the automake package) ++# still uses it. Otherwise, the use in gettext.m4 makes autoheader ++# give these diagnostics: ++# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX ++# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX ++ ++undefine([AC_ISC_POSIX]) ++ ++AC_DEFUN([AC_ISC_POSIX], ++ [ ++ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. ++ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) ++ ] ++) ++ ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++ ++# serial 48 AC_PROG_LIBTOOL ++ ++ ++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++# ----------------------------------------------------------- ++# If this macro is not defined by Autoconf, define it here. ++m4_ifdef([AC_PROVIDE_IFELSE], ++ [], ++ [m4_define([AC_PROVIDE_IFELSE], ++ [m4_ifdef([AC_PROVIDE_$1], ++ [$2], [$3])])]) ++ ++ ++# AC_PROG_LIBTOOL ++# --------------- ++AC_DEFUN([AC_PROG_LIBTOOL], ++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++ AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [AC_LIBTOOL_CXX], ++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++ ])]) ++dnl And a similar setup for Fortran 77 support ++ AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [AC_LIBTOOL_F77], ++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++])]) ++ ++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++ AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [ifdef([AC_PROG_GCJ], ++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([A][M_PROG_GCJ], ++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([LT_AC_PROG_GCJ], ++ [define([LT_AC_PROG_GCJ], ++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++])])# AC_PROG_LIBTOOL ++ ++ ++# _AC_PROG_LIBTOOL ++# ---------------- ++AC_DEFUN([_AC_PROG_LIBTOOL], ++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL ++ ++ ++# AC_LIBTOOL_SETUP ++# ---------------- ++AC_DEFUN([AC_LIBTOOL_SETUP], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AC_ENABLE_SHARED])dnl ++AC_REQUIRE([AC_ENABLE_STATIC])dnl ++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_LD])dnl ++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++AC_REQUIRE([AC_PROG_NM])dnl ++ ++AC_REQUIRE([AC_PROG_LN_S])dnl ++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++AC_REQUIRE([AC_OBJEXT])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++dnl ++ ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR ++ ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++ ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Constants: ++rm="rm -f" ++ ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++ ++_LT_CC_BASENAME([$compiler]) ++ ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ AC_PATH_MAGIC ++ fi ++ ;; ++esac ++ ++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++enable_win32_dll=yes, enable_win32_dll=no) ++ ++AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++AC_ARG_WITH([pic], ++ [AC_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++test -z "$pic_mode" && pic_mode=default ++ ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP ++ ++ ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++ ++# _LT_AC_SYS_LIBPATH_AIX ++# ---------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++}'` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++}'`; fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_AC_SYS_LIBPATH_AIX ++ ++ ++# _LT_AC_SHELL_INIT(ARG) ++# ---------------------- ++AC_DEFUN([_LT_AC_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_AC_SHELL_INIT ++ ++ ++# _LT_AC_PROG_ECHO_BACKSLASH ++# -------------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++[_LT_AC_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac ++ ++echo=${ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi ++ ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH ++ ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break ++ fi ++ done ++fi ++ ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo ++ fi ++ fi ++ fi ++ fi ++fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi ++ ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH ++ ++ ++# _LT_AC_LOCK ++# ----------- ++AC_DEFUN([_LT_AC_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++ ]) ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++])# _LT_AC_LOCK ++ ++ ++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++]) ++ ++if test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION ++ ++ ++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ------------------------------------------------------------ ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++[AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) ++ ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION ++ ++ ++# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# -------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++[# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++])# AC_LIBTOOL_SYS_MAX_CMD_LEN ++ ++ ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN ++ ++ ++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# --------------------------------------------------------------------- ++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext < ++#endif ++ ++#include ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif ++ ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ exit (status); ++}] ++EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_AC_TRY_DLOPEN_SELF ++ ++ ++# AC_LIBTOOL_DLOPEN_SELF ++# ---------------------- ++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; ++ ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++])# AC_LIBTOOL_DLOPEN_SELF ++ ++ ++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++# --------------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler ++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++]) ++])# AC_LIBTOOL_PROG_CC_C_O ++ ++ ++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++# ----------------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++[AC_REQUIRE([_LT_AC_LOCK])dnl ++ ++hard_links="nottested" ++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++ ++ ++# AC_LIBTOOL_OBJDIR ++# ----------------- ++AC_DEFUN([AC_LIBTOOL_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++])# AC_LIBTOOL_OBJDIR ++ ++ ++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++# ---------------------------------------------- ++# Check hardcoding attributes. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_AC_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++ ++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++ ++ ++# AC_LIBTOOL_SYS_LIB_STRIP ++# ------------------------ ++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++[striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++])# AC_LIBTOOL_SYS_LIB_STRIP ++ ++ ++# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++[AC_MSG_CHECKING([dynamic linker characteristics]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++if test "$GCC" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix4* | aix5*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. ++ if test "$GCC" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` ++ else ++ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' ++ fi ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++kfreebsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='GNU ld.so' ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ freebsd*) # from 4.6 on ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix3*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390x*|powerpc64*) ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++knetbsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='GNU ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++nto-qnx*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++ ++ ++# _LT_AC_TAGCONFIG ++# ---------------- ++AC_DEFUN([_LT_AC_TAGCONFIG], ++[AC_ARG_WITH([tags], ++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++ [include additional configurations @<:@automatic@:>@])], ++ [tagnames="$withval"]) ++ ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ AC_MSG_WARN([output file `$ofile' does not exist]) ++ fi ++ ++ if test -z "$LTCC"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++ if test -z "$LTCC"; then ++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++ else ++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) ++ fi ++ fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi ++ ++ # Extract list of available tagged configurations in $ofile. ++ # Note that this assumes the entire list is on one line. ++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` ++ ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for tagname in $tagnames; do ++ IFS="$lt_save_ifs" ++ # Check whether tagname contains only valid characters ++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++ "") ;; ++ *) AC_MSG_ERROR([invalid tag name: $tagname]) ++ ;; ++ esac ++ ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++ fi ++ ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile ++ ++ case $tagname in ++ CXX) ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_LIBTOOL_LANG_CXX_CONFIG ++ else ++ tagname="" ++ fi ++ ;; ++ ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ AC_LIBTOOL_LANG_F77_CONFIG ++ else ++ tagname="" ++ fi ++ ;; ++ ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ AC_LIBTOOL_LANG_GCJ_CONFIG ++ else ++ tagname="" ++ fi ++ ;; ++ ++ RC) ++ AC_LIBTOOL_LANG_RC_CONFIG ++ ;; ++ ++ *) ++ AC_MSG_ERROR([Unsupported tag name: $tagname]) ++ ;; ++ esac ++ ++ # Append the new tag name to the list of available tags. ++ if test -n "$tagname" ; then ++ available_tags="$available_tags $tagname" ++ fi ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ # Now substitute the updated list of available tags. ++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++ mv "${ofile}T" "$ofile" ++ chmod +x "$ofile" ++ else ++ rm -f "${ofile}T" ++ AC_MSG_ERROR([unable to update list of available tagged configurations.]) ++ fi ++fi ++])# _LT_AC_TAGCONFIG ++ ++ ++# AC_LIBTOOL_DLOPEN ++# ----------------- ++# enable checks for dlopen support ++AC_DEFUN([AC_LIBTOOL_DLOPEN], ++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_DLOPEN ++ ++ ++# AC_LIBTOOL_WIN32_DLL ++# -------------------- ++# declare package support for building win32 DLLs ++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_WIN32_DLL ++ ++ ++# AC_ENABLE_SHARED([DEFAULT]) ++# --------------------------- ++# implement the --enable-shared flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_SHARED], ++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([shared], ++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++])# AC_ENABLE_SHARED ++ ++ ++# AC_DISABLE_SHARED ++# ----------------- ++# set the default shared flag to --disable-shared ++AC_DEFUN([AC_DISABLE_SHARED], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_SHARED(no) ++])# AC_DISABLE_SHARED ++ ++ ++# AC_ENABLE_STATIC([DEFAULT]) ++# --------------------------- ++# implement the --enable-static flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_STATIC], ++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([static], ++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++])# AC_ENABLE_STATIC ++ ++ ++# AC_DISABLE_STATIC ++# ----------------- ++# set the default static flag to --disable-static ++AC_DEFUN([AC_DISABLE_STATIC], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_STATIC(no) ++])# AC_DISABLE_STATIC ++ ++ ++# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++# --------------------------------- ++# implement the --enable-fast-install flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([fast-install], ++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++])# AC_ENABLE_FAST_INSTALL ++ ++ ++# AC_DISABLE_FAST_INSTALL ++# ----------------------- ++# set the default to --disable-fast-install ++AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_FAST_INSTALL(no) ++])# AC_DISABLE_FAST_INSTALL ++ ++ ++# AC_LIBTOOL_PICMODE([MODE]) ++# -------------------------- ++# implement the --with-pic flag ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++AC_DEFUN([AC_LIBTOOL_PICMODE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++pic_mode=ifelse($#,1,$1,default) ++])# AC_LIBTOOL_PICMODE ++ ++ ++# AC_PROG_EGREP ++# ------------- ++# This is predefined starting with Autoconf 2.54, so this conditional ++# definition can be removed once we require Autoconf 2.54 or later. ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' ++ fi]) ++ EGREP=$ac_cv_prog_egrep ++ AC_SUBST([EGREP]) ++])]) ++ ++ ++# AC_PATH_TOOL_PREFIX ++# ------------------- ++# find a file program which can recognise shared library ++AC_DEFUN([AC_PATH_TOOL_PREFIX], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="ifelse([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++])# AC_PATH_TOOL_PREFIX ++ ++ ++# AC_PATH_MAGIC ++# ------------- ++# find a file program which can recognise a shared library ++AC_DEFUN([AC_PATH_MAGIC], ++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ else ++ MAGIC_CMD=: ++ fi ++fi ++])# AC_PATH_MAGIC ++ ++ ++# AC_PROG_LD ++# ---------- ++# find the pathname to the GNU or non-GNU linker ++AC_DEFUN([AC_PROG_LD], ++[AC_ARG_WITH([gnu-ld], ++ [AC_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no]) ++AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; ++ ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac ++ ;; ++ ++interix3*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++# This must be Linux ELF. ++linux*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++ fi ++ ;; ++ ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; ++ ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown ++ ;; ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ fi ++ ;; ++ ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac ++]) ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++])# AC_DEPLIBS_CHECK_METHOD ++ ++ ++# AC_PROG_NM ++# ---------- ++# find the pathname to a BSD-compatible name lister ++AC_DEFUN([AC_PROG_NM], ++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi]) ++NM="$lt_cv_path_NM" ++])# AC_PROG_NM ++ ++ ++# AC_CHECK_LIBM ++# ------------- ++# check for math library ++AC_DEFUN([AC_CHECK_LIBM], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it ++ ;; ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++ ;; ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") ++ ;; ++esac ++])# AC_CHECK_LIBM ++ ++ ++# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl convenience library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. ++AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ case $enable_ltdl_convenience in ++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++ "") enable_ltdl_convenience=yes ++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ++ esac ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_CONVENIENCE ++ ++ ++# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl installable library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. ++# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ AC_CHECK_LIB(ltdl, lt_dlinit, ++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++ [if test x"$enable_ltdl_install" = xno; then ++ AC_MSG_WARN([libltdl not installed, but installation disabled]) ++ else ++ enable_ltdl_install=yes ++ fi ++ ]) ++ if test x"$enable_ltdl_install" = x"yes"; then ++ ac_configure_args="$ac_configure_args --enable-ltdl-install" ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ else ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= ++ fi ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_INSTALLABLE ++ ++ ++# AC_LIBTOOL_CXX ++# -------------- ++# enable support for C++ libraries ++AC_DEFUN([AC_LIBTOOL_CXX], ++[AC_REQUIRE([_LT_AC_LANG_CXX]) ++])# AC_LIBTOOL_CXX ++ ++ ++# _LT_AC_LANG_CXX ++# --------------- ++AC_DEFUN([_LT_AC_LANG_CXX], ++[AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++])# _LT_AC_LANG_CXX ++ ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++fi ++])# _LT_AC_PROG_CXXCPP ++ ++# AC_LIBTOOL_F77 ++# -------------- ++# enable support for Fortran 77 libraries ++AC_DEFUN([AC_LIBTOOL_F77], ++[AC_REQUIRE([_LT_AC_LANG_F77]) ++])# AC_LIBTOOL_F77 ++ ++ ++# _LT_AC_LANG_F77 ++# --------------- ++AC_DEFUN([_LT_AC_LANG_F77], ++[AC_REQUIRE([AC_PROG_F77]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++])# _LT_AC_LANG_F77 ++ ++ ++# AC_LIBTOOL_GCJ ++# -------------- ++# enable support for GCJ libraries ++AC_DEFUN([AC_LIBTOOL_GCJ], ++[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++])# AC_LIBTOOL_GCJ ++ ++ ++# _LT_AC_LANG_GCJ ++# --------------- ++AC_DEFUN([_LT_AC_LANG_GCJ], ++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++])# _LT_AC_LANG_GCJ ++ ++ ++# AC_LIBTOOL_RC ++# ------------- ++# enable support for Windows resource files ++AC_DEFUN([AC_LIBTOOL_RC], ++[AC_REQUIRE([LT_AC_PROG_RC]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++])# AC_LIBTOOL_RC ++ ++ ++# AC_LIBTOOL_LANG_C_CONFIG ++# ------------------------ ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++[lt_save_CC="$CC" ++AC_LANG_PUSH(C) ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;\n" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}\n' ++ ++_LT_AC_SYS_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++AC_LIBTOOL_SYS_LIB_STRIP ++AC_LIBTOOL_DLOPEN_SELF ++ ++# Report which library types will actually be built ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) ++ ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no ++ ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++esac ++AC_MSG_RESULT([$enable_shared]) ++ ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) ++ ++AC_LIBTOOL_CONFIG($1) ++ ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_C_CONFIG ++ ++ ++# AC_LIBTOOL_LANG_CXX_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) ++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], ++[AC_LANG_PUSH(C++) ++AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++ ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Dependencies to place before and after the object being linked: ++_LT_AC_TAGVAR(predep_objects, $1)= ++_LT_AC_TAGVAR(postdep_objects, $1)= ++_LT_AC_TAGVAR(predeps, $1)= ++_LT_AC_TAGVAR(postdeps, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++ ++# Source file extension for C++ test sources. ++ac_ext=cpp ++ ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;\n" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_LD=$LD ++lt_save_GCC=$GCC ++GCC=$GXX ++lt_save_with_gnu_ld=$with_gnu_ld ++lt_save_path_LD=$lt_cv_path_LD ++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++else ++ $as_unset lt_cv_prog_gnu_ld ++fi ++if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++else ++ $as_unset lt_cv_path_LD ++fi ++test -z "${LDCXX+set}" || LD=$LDCXX ++CC=${CXX-"c++"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++ ++# We don't want -fno-exception wen compiling C++ code, so set the ++# no_builtin_flag separately ++if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++else ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++fi ++ ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration ++ ++ AC_PROG_LD ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++ grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++fi ++ ++# PORTME: fill in a description of your system's C++ link characteristics ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++_LT_AC_TAGVAR(ld_shlibs, $1)=yes ++case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aix4* | aix5*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no ++ output_verbose_link_cmd='echo' ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes ++ fi ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ fi ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before switch to ELF ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ freebsd-elf*) ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ ;; ++ freebsd* | kfreebsd*-gnu | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ gnu*) ++ ;; ++ hpux9*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ interix3*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ fi ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ linux*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc*) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC*) ++ # Portland Group C++ compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ esac ++ ;; ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; ++ osf3*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $rm $lib.exp' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The C++ compiler is used as linker so we must use $wl ++ # flag to pass the commands to the underlying system ++ # linker. We must also pass each convience library through ++ # to the system linker between allextract/defaultextract. ++ # The C++ compiler will combine linker options so we ++ # cannot just pass the convience library names through ++ # without $wl. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | grep -v '^2\.7' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ fi ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ fi ++ ;; ++ esac ++ ;; ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++esac ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++_LT_AC_TAGVAR(GCC, $1)="$GXX" ++_LT_AC_TAGVAR(LD, $1)="$LD" ++ ++AC_LIBTOOL_POSTDEP_PREDEP($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++ ++AC_LIBTOOL_CONFIG($1) ++ ++AC_LANG_POP ++CC=$lt_save_CC ++LDCXX=$LD ++LD=$lt_save_LD ++GCC=$lt_save_GCC ++with_gnu_ldcxx=$with_gnu_ld ++with_gnu_ld=$lt_save_with_gnu_ld ++lt_cv_path_LDCXX=$lt_cv_path_LD ++lt_cv_path_LD=$lt_save_path_LD ++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++])# AC_LIBTOOL_LANG_CXX_CONFIG ++ ++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++# ------------------------------------ ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" ++ifelse([$1], [], ++[#! $SHELL ++ ++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ++# Free Software Foundation, Inc. ++# ++# This file is part of GNU Libtool: ++# Originally by Gordon Matzigkeit , 1996 ++# ++# 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. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="$SED -e 1s/^X//" ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++# The names of the tagged configurations supported by this script. ++available_tags= ++ ++# ### BEGIN LIBTOOL CONFIG], ++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) ++ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) ++ ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# An echo program that does not interpret backslashes. ++echo=$lt_echo ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A C compiler. ++LTCC=$lt_LTCC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ ++# A language-specific compiler. ++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) ++ ++# Is the compiler the GNU C compiler? ++with_gcc=$_LT_AC_TAGVAR(GCC, $1) ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# The linker used to build libraries. ++LD=$lt_[]_LT_AC_TAGVAR(LD, $1) ++ ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S ++ ++# A BSD-compatible nm program. ++NM=$lt_NM ++ ++# A symbol stripping program ++STRIP=$lt_STRIP ++ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD ++ ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" ++ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" ++ ++# Used on cygwin: assembler. ++AS="$AS" ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ ++# Object file suffix (normally "o"). ++objext="$ac_objext" ++ ++# Old archive suffix (normally "a"). ++libext="$libext" ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' ++ ++# Executable file suffix (normally ""). ++exeext="$exeext" ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++pic_mode=$pic_mode ++ ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) ++ ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) ++ ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) ++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) ++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) ++ ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++ ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) ++ ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) ++ ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) ++ ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) ++ ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) ++ ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) ++ ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" ++ ++# Set to yes if exported symbols are required. ++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) ++ ++ifelse([$1],[], ++[# ### END LIBTOOL CONFIG], ++[# ### END LIBTOOL TAG CONFIG: $tagname]) ++ ++__EOF__ ++ ++ifelse([$1],[], [ ++ case $host_os in ++ aix3*) ++ cat <<\EOF >> "$cfgfile" ++ ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++EOF ++ ;; ++ esac ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || \ ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++]) ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi ++])# AC_LIBTOOL_CONFIG ++ ++ ++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], ++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++ ++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ ++if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ lt_cv_prog_compiler_rtti_exceptions, ++ [-fno-rtti -fno-exceptions], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++fi ++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI ++ ++ ++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++# --------------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], ++[AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_REQUIRE([AC_PROG_NM]) ++AC_REQUIRE([AC_OBJEXT]) ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++[ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ ++# Character class describing NM global symbol codes. ++symcode='[[BCDEGRST]]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++ ++# Transform an extracted symbol line into a proper C declaration ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[[BCDT]]' ++ ;; ++cygwin* | mingw* | pw32*) ++ symcode='[[ABCDGISTW]]' ++ ;; ++hpux*) # Its linker distinguishes data from code symbols ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDEGRST]]' ++ fi ++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++ ;; ++linux*) ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDGIRSTW]]' ++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[[BCDEGRST]]' ++ ;; ++osf*) ++ symcode='[[BCDEGQRST]]' ++ ;; ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' ++ ;; ++sysv4) ++ symcode='[[DFNSTU]]' ++ ;; ++esac ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[[ABCDGIRSTW]]' ;; ++esac ++ ++# Try without a prefix undercore, then with it. ++for ac_symprfx in "" "_"; do ++ ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ ++ # Write the raw and C identifiers. ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ ++ # Check to see that the pipe works correctly. ++ pipe_works=no ++ ++ rm -f conftest* ++ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi ++ ++ # Make sure that we snagged all the symbols we need. ++ if grep ' nm_test_var$' "$nlist" >/dev/null; then ++ if grep ' nm_test_func$' "$nlist" >/dev/null; then ++ cat < conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++ ++ cat <> conftest.$ac_ext ++#if defined (__STDC__) && __STDC__ ++# define lt_ptr_t void * ++#else ++# define lt_ptr_t char * ++# define const ++#endif ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ lt_ptr_t address; ++} ++lt_preloaded_symbols[[]] = ++{ ++EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++ cat <<\EOF >> conftest.$ac_ext ++ {0, (lt_ptr_t) 0} ++}; ++ ++#ifdef __cplusplus ++} ++#endif ++EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -f conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++]) ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ AC_MSG_RESULT(failed) ++else ++ AC_MSG_RESULT(ok) ++fi ++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++ ++ ++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) ++# --------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], ++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++ ++AC_MSG_CHECKING([for $compiler option to produce PIC]) ++ ifelse([$1],[CXX],[ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ mingw* | os2* | pw32*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix4* | aix5*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | kfreebsd*-gnu | dragonfly*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ fi ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux*) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ icpc* | ecpc*) ++ # Intel C++ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgCC*) ++ # Portland Group C++ compiler. ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd*) ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | pw32* | os2*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ mingw* | pw32* | os2*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ newsos6) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ linux*) ++ case $cc_basename in ++ icc* | ecc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All Alpha code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ esac ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ solaris*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ ++ uts4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++]) ++ ++ ++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++# ------------------------------------ ++# See if the linker supports building shared libraries. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++ifelse([$1],[CXX],[ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ case $host_os in ++ aix4* | aix5*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ ;; ++ cygwin* | mingw*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ *) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ esac ++],[ ++ runpath_var= ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)= ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++ _LT_AC_TAGVAR(module_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ _LT_AC_TAGVAR(include_expsyms, $1)= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix3* | aix4* | aix5*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix3*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ linux*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ $echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; ++ ++ aix4* | aix5*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ # see comment about different semantics on the GNU ld section ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ bsdi[[45]]*) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ freebsd1*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | kfreebsd*-gnu | dragonfly*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ newsos6) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ openbsd*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ ;; ++ ++ os2*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ ++ solaris*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine linker options so we ++ # cannot just pass the convience library names through ++ # without $wl, iff we do not link with $LD. ++ # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ case $wlarc in ++ '') ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; ++ esac ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4.3*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ fi ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $rm conftest* ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; ++ esac ++ fi ++ ;; ++esac ++])# AC_LIBTOOL_PROG_LD_SHLIBS ++ ++ ++# _LT_AC_FILE_LTDLL_C ++# ------------------- ++# Be careful that the start marker always follows a newline. ++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++# /* ltdll.c starts here */ ++# #define WIN32_LEAN_AND_MEAN ++# #include ++# #undef WIN32_LEAN_AND_MEAN ++# #include ++# ++# #ifndef __CYGWIN__ ++# # ifdef __CYGWIN32__ ++# # define __CYGWIN__ __CYGWIN32__ ++# # endif ++# #endif ++# ++# #ifdef __cplusplus ++# extern "C" { ++# #endif ++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++# #ifdef __cplusplus ++# } ++# #endif ++# ++# #ifdef __CYGWIN__ ++# #include ++# DECLARE_CYGWIN_DLL( DllMain ); ++# #endif ++# HINSTANCE __hDllInstance_base; ++# ++# BOOL APIENTRY ++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++# { ++# __hDllInstance_base = hInst; ++# return TRUE; ++# } ++# /* ltdll.c ends here */ ++])# _LT_AC_FILE_LTDLL_C ++ ++ ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) ++ ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) ++]) ++ ++AC_DEFUN([LT_AC_PROG_RC], ++[AC_CHECK_TOOL(RC, windres, no) ++]) ++ ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_SED. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done ++ done ++done ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_MSG_RESULT([$SED]) ++]) ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [$4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES ++ ++m4_include([acinclude.m4]) +diff -ruN evolution-2.12.2.orig/addressbook/conduit/Makefile.in evolution-2.12.2/addressbook/conduit/Makefile.in +--- evolution-2.12.2.orig/addressbook/conduit/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/conduit/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/conduit +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privconduitdir)" \ +- "$(DESTDIR)$(conduitdir)" +-privconduitLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privconduit_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libeaddress_conduit_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/e-util/libeconduit.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(am__DEPENDENCIES_1) +-am_libeaddress_conduit_la_OBJECTS = address-conduit.lo +-libeaddress_conduit_la_OBJECTS = $(am_libeaddress_conduit_la_OBJECTS) +-libeaddress_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libeaddress_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libeaddress_conduit_la_SOURCES) +-DIST_SOURCES = $(libeaddress_conduit_la_SOURCES) +-conduitDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(conduit_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)/e-util \ +@@ -406,89 +397,102 @@ + + # Address Conduit + privconduit_LTLIBRARIES = libeaddress_conduit.la ++ + libeaddress_conduit_la_SOURCES = \ + address-conduit.c + ++ + libeaddress_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + libeaddress_conduit_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeconduit.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) + ++ + conduitdir = $(datadir)/gnome-pilot/conduits/ + conduit_DATA = e-address.conduit ++ + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + e-address.conduit.in + ++subdir = addressbook/conduit ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privconduit_LTLIBRARIES) ++ ++libeaddress_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/e-util/libeconduit.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la ++am_libeaddress_conduit_la_OBJECTS = address-conduit.lo ++libeaddress_conduit_la_OBJECTS = $(am_libeaddress_conduit_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/address-conduit.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libeaddress_conduit_la_SOURCES) ++DATA = $(conduit_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libeaddress_conduit_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/conduit/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/conduit/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privconduitLTLIBRARIES_INSTALL = $(INSTALL) + install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ + else :; fi; \ + done + + uninstall-privconduitLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ + done + + clean-privconduitLTLIBRARIES: + -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libeaddress_conduit.la: $(libeaddress_conduit_la_OBJECTS) $(libeaddress_conduit_la_DEPENDENCIES) +- $(libeaddress_conduit_la_LINK) -rpath $(privconduitdir) $(libeaddress_conduit_la_OBJECTS) $(libeaddress_conduit_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privconduitdir) $(libeaddress_conduit_la_LDFLAGS) $(libeaddress_conduit_la_OBJECTS) $(libeaddress_conduit_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -496,49 +500,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/address-conduit.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++conduitDATA_INSTALL = $(INSTALL_DATA) + install-conduitDATA: $(conduit_DATA) + @$(NORMAL_INSTALL) +- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(conduitdir) + @list='$(conduit_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ +- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ ++ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ + done + + uninstall-conduitDATA: + @$(NORMAL_UNINSTALL) + @list='$(conduit_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ ++ rm -f $(DESTDIR)$(conduitdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -547,7 +576,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -559,11 +587,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -586,23 +613,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -620,10 +652,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -645,7 +676,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -660,34 +691,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-conduitDATA install-privconduitLTLIBRARIES + +-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 +@@ -708,25 +729,21 @@ + + ps-am: + +-uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-conduitDATA uninstall-info-am \ ++ uninstall-privconduitLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-conduitDATA \ +- 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-privconduitLTLIBRARIES install-ps \ +- install-ps-am 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-conduitDATA \ +- uninstall-privconduitLTLIBRARIES ++ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-conduitDATA install-data install-data-am \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ ++ uninstall-info-am uninstall-privconduitLTLIBRARIES + + + e-address.conduit: e-address.conduit.in +diff -ruN evolution-2.12.2.orig/addressbook/gui/component/Makefile.in evolution-2.12.2/addressbook/gui/component/Makefile.in +--- evolution-2.12.2.orig/addressbook/gui/component/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/gui/component/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,82 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/gui/component +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" +-componentLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(component_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_addressbook_la_DEPENDENCIES = $(SMIME_LIB) \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/addressbook/printing/libecontactprint.la \ +- $(top_builddir)/shell/libeshell.la \ +- $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ +- $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ +- $(top_builddir)/filter/libfilter.la \ +- $(top_builddir)/addressbook/util/libeabutil.la \ +- $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ +- $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ +- $(top_builddir)/widgets/table/libetable.la \ +- $(top_builddir)/widgets/text/libetext.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/widgets/misc/libefilterbar.la \ +- $(top_builddir)/widgets/menus/libmenus.la \ +- $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ +- $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_libevolution_addressbook_la_OBJECTS = addressbook-component.lo \ +- addressbook-config.lo addressbook-migrate.lo \ +- autocompletion-config.lo addressbook.lo addressbook-view.lo \ +- component-factory.lo +-libevolution_addressbook_la_OBJECTS = \ +- $(am_libevolution_addressbook_la_OBJECTS) +-libevolution_addressbook_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(libevolution_addressbook_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_addressbook_la_SOURCES) +-DIST_SOURCES = $(libevolution_addressbook_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-serverDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) $(schema_DATA) $(server_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -140,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -151,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -176,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -201,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -209,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -267,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -291,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -315,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -323,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -330,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -339,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -361,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -391,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -410,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-addressbook\" \ +@@ -434,7 +405,9 @@ + $(LDAP_CFLAGS) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + component_LTLIBRARIES = libevolution-addressbook.la ++ + libevolution_addressbook_la_SOURCES = \ + addressbook-component.c \ + addressbook-component.h \ +@@ -451,8 +424,10 @@ + component-factory.c + + ++ + # $(top_builddir)/addressbook/printing/libecontactprint.la + @ENABLE_SMIME_TRUE@SMIME_LIB = $(top_builddir)/smime/gui/libevolution-smime.la ++ + libevolution_addressbook_la_LIBADD = \ + $(SMIME_LIB) \ + $(top_builddir)/e-util/libeutil.la \ +@@ -473,93 +448,150 @@ + $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) + ++ + libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + ++ + # GConf schemas + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = apps_evolution_addressbook.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + server_in_files = GNOME_Evolution_Addressbook.server.in.in + server_DATA = $(server_in_files:.server.in.in=.server) ++ + glade_DATA = \ + ldap-config.glade + ++ + BUILT_SOURCES = $(server_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++ + EXTRA_DIST = \ + $(glade_DATA) \ + $(schema_in_files) \ + $(server_in_files) \ + openldap-extract.h + ++ + @ENABLE_PURIFY_TRUE@PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ++subdir = addressbook/gui/component ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(component_LTLIBRARIES) ++ ++@ENABLE_SMIME_TRUE@libevolution_addressbook_la_DEPENDENCIES = \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/smime/gui/libevolution-smime.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/e-util/libeutil.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/printing/libecontactprint.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/shell/libeshell.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/filter/libfilter.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/util/libeabutil.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/table/libetable.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/text/libetext.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/misc/libefilterbar.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/menus/libmenus.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ ++@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la ++@ENABLE_SMIME_FALSE@libevolution_addressbook_la_DEPENDENCIES = \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/e-util/libeutil.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/printing/libecontactprint.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/shell/libeshell.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/filter/libfilter.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/util/libeabutil.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/table/libetable.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/text/libetext.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/misc/libefilterbar.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/menus/libmenus.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ ++@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la ++am_libevolution_addressbook_la_OBJECTS = addressbook-component.lo \ ++ addressbook-config.lo addressbook-migrate.lo \ ++ autocompletion-config.lo addressbook.lo addressbook-view.lo \ ++ component-factory.lo ++libevolution_addressbook_la_OBJECTS = \ ++ $(am_libevolution_addressbook_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addressbook-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/addressbook-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/addressbook-migrate.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/addressbook-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/autocompletion-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/component-factory.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_addressbook_la_SOURCES) ++DATA = $(glade_DATA) $(schema_DATA) $(server_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_addressbook_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/component/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/gui/component/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++componentLTLIBRARIES_INSTALL = $(INSTALL) + install-componentLTLIBRARIES: $(component_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ + else :; fi; \ + done + + uninstall-componentLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ + done + + clean-componentLTLIBRARIES: + -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-addressbook.la: $(libevolution_addressbook_la_OBJECTS) $(libevolution_addressbook_la_DEPENDENCIES) +- $(libevolution_addressbook_la_LINK) -rpath $(componentdir) $(libevolution_addressbook_la_OBJECTS) $(libevolution_addressbook_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(componentdir) $(libevolution_addressbook_la_LDFLAGS) $(libevolution_addressbook_la_OBJECTS) $(libevolution_addressbook_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -573,83 +605,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/component-factory.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done ++serverDATA_INSTALL = $(INSTALL_DATA) + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" ++ $(mkinstalldirs) $(DESTDIR)$(serverdir) + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ +- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ ++ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ + done + + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ++ rm -f $(DESTDIR)$(serverdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -658,7 +717,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -670,11 +728,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -697,23 +754,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -730,12 +792,10 @@ + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +-@ENABLE_PURIFY_FALSE@all-local: + all-am: Makefile $(LTLIBRARIES) $(DATA) all-local ++ + installdirs: +- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -757,7 +817,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -773,14 +833,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -788,20 +846,12 @@ + install-data-am: install-componentLTLIBRARIES install-data-local \ + install-gladeDATA install-schemaDATA install-serverDATA + +-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 +@@ -823,26 +873,22 @@ + ps-am: + + uninstall-am: uninstall-componentLTLIBRARIES uninstall-gladeDATA \ +- uninstall-schemaDATA uninstall-serverDATA +- +-.MAKE: install-am install-strip ++ uninstall-info-am uninstall-schemaDATA uninstall-serverDATA + + .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-componentLTLIBRARIES clean-generic clean-libtool ctags \ +- dist-hook distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am \ +- install-componentLTLIBRARIES install-data install-data-am \ +- install-data-local install-dvi install-dvi-am install-exec \ +- install-exec-am install-gladeDATA install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-schemaDATA \ +- install-serverDATA 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-componentLTLIBRARIES \ +- uninstall-gladeDATA uninstall-schemaDATA uninstall-serverDATA ++ distclean distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-componentLTLIBRARIES install-data \ ++ install-data-am install-data-local install-exec install-exec-am \ ++ install-gladeDATA install-info install-info-am install-man \ ++ install-schemaDATA install-serverDATA 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-componentLTLIBRARIES \ ++ uninstall-gladeDATA uninstall-info-am uninstall-schemaDATA \ ++ uninstall-serverDATA + + + @INTLTOOL_SCHEMAS_RULE@ +diff -ruN evolution-2.12.2.orig/addressbook/gui/contact-editor/Makefile.in evolution-2.12.2/addressbook/gui/contact-editor/Makefile.in +--- evolution-2.12.2.orig/addressbook/gui/contact-editor/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/gui/contact-editor/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,63 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/gui/contact-editor +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libecontacteditor_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am__objects_1 = e-contact-editor-marshal.lo +-am_libecontacteditor_la_OBJECTS = $(am__objects_1) eab-editor.lo \ +- e-contact-editor-im.lo e-contact-editor-address.lo \ +- e-contact-editor-fullname.lo e-contact-editor.lo \ +- e-contact-quick-add.lo +-libecontacteditor_la_OBJECTS = $(am_libecontacteditor_la_OBJECTS) +-libecontacteditor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libecontacteditor_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libecontacteditor_la_SOURCES) +-DIST_SOURCES = $(libecontacteditor_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -121,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -132,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -157,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -182,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -190,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -248,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -272,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -296,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -304,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -311,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -320,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -342,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -372,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -391,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +@@ -410,9 +401,11 @@ + -DG_LOG_DOMAIN=\"contact-editor\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + privsolib_LTLIBRARIES = \ + libecontacteditor.la + ++ + libecontacteditor_la_SOURCES = \ + $(MARSHAL_GENERATED) \ + eab-editor.c \ +@@ -428,91 +421,118 @@ + e-contact-quick-add.c \ + e-contact-quick-add.h + ++ + libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED) ++ + libecontacteditor_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h ++ + glade_DATA = \ + im.glade \ + contact-editor.glade \ + fulladdr.glade \ + fullname.glade + ++ + BUILT_SOURCES = $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = $(glade_DATA) \ + e-contact-editor-marshal.list + ++subdir = addressbook/gui/contact-editor ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libecontacteditor_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la ++@OS_WIN32_FALSE@libecontacteditor_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la ++am__objects_1 = e-contact-editor-marshal.lo ++am_libecontacteditor_la_OBJECTS = $(am__objects_1) eab-editor.lo \ ++ e-contact-editor-im.lo e-contact-editor-address.lo \ ++ e-contact-editor-fullname.lo e-contact-editor.lo \ ++ e-contact-quick-add.lo ++libecontacteditor_la_OBJECTS = $(am_libecontacteditor_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-contact-editor-address.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor-fullname.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor-im.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-quick-add.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-editor.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libecontacteditor_la_SOURCES) ++DATA = $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libecontacteditor_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/contact-editor/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/gui/contact-editor/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libecontacteditor.la: $(libecontacteditor_la_OBJECTS) $(libecontacteditor_la_DEPENDENCIES) +- $(libecontacteditor_la_LINK) -rpath $(privsolibdir) $(libecontacteditor_la_OBJECTS) $(libecontacteditor_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libecontacteditor_la_LDFLAGS) $(libecontacteditor_la_OBJECTS) $(libecontacteditor_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -526,49 +546,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eab-editor.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -577,7 +622,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -589,11 +633,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -616,23 +659,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -647,10 +695,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -672,7 +719,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -687,34 +734,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-gladeDATA install-privsolibLTLIBRARIES + +-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 +@@ -735,24 +772,21 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ +- 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-gladeDATA uninstall-privsolibLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-privsolibLTLIBRARIES 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-gladeDATA \ ++ uninstall-info-am uninstall-privsolibLTLIBRARIES + + @EVO_MARSHAL_RULE@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -ruN evolution-2.12.2.orig/addressbook/gui/contact-list-editor/Makefile.in evolution-2.12.2/addressbook/gui/contact-list-editor/Makefile.in +--- evolution-2.12.2.orig/addressbook/gui/contact-list-editor/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/gui/contact-list-editor/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,67 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/gui/contact-list-editor +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(etspecdir)" \ +- "$(DESTDIR)$(gladedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libecontactlisteditor_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/addressbook/util/libeabutil.la \ +- $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ +- $(top_builddir)/widgets/table/libetable.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am__objects_1 = e-contact-list-editor-marshal.lo +-am_libecontactlisteditor_la_OBJECTS = $(am__objects_1) \ +- e-contact-list-editor.lo e-contact-list-model.lo +-libecontactlisteditor_la_OBJECTS = \ +- $(am_libecontactlisteditor_la_OBJECTS) +-libecontactlisteditor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libecontactlisteditor_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libecontactlisteditor_la_SOURCES) +-DIST_SOURCES = $(libecontactlisteditor_la_SOURCES) +-etspecDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(etspec_DATA) $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -125,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -136,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -161,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -186,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -194,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -252,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -276,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -300,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -308,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -315,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -324,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -346,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -376,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -395,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +@@ -414,9 +401,11 @@ + -DG_LOG_DOMAIN=\"contact-list-editor\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + privsolib_LTLIBRARIES = \ + libecontactlisteditor.la + ++ + libecontactlisteditor_la_SOURCES = \ + $(MARSHAL_GENERATED) \ + e-contact-list-editor.c \ +@@ -424,7 +413,9 @@ + e-contact-list-model.c \ + e-contact-list-model.h + ++ + libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) ++ + libecontactlisteditor_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/addressbook/util/libeabutil.la \ +@@ -434,81 +425,107 @@ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h ++ + glade_DATA = contact-list-editor.glade + etspec_DATA = e-contact-list-editor.etspec ++ + BUILT_SOURCES = $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = $(glade_DATA) \ + $(etspec_DATA) \ + e-contact-list-editor-marshal.list + ++subdir = addressbook/gui/contact-list-editor ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libecontactlisteditor_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/addressbook/util/libeabutil.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/table/libetable.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la ++@OS_WIN32_FALSE@libecontactlisteditor_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/addressbook/util/libeabutil.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/table/libetable.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la ++am__objects_1 = e-contact-list-editor-marshal.lo ++am_libecontactlisteditor_la_OBJECTS = $(am__objects_1) \ ++ e-contact-list-editor.lo e-contact-list-model.lo ++libecontactlisteditor_la_OBJECTS = \ ++ $(am_libecontactlisteditor_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-contact-list-editor-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-list-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-list-model.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libecontactlisteditor_la_SOURCES) ++DATA = $(etspec_DATA) $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libecontactlisteditor_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/contact-list-editor/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/gui/contact-list-editor/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libecontactlisteditor.la: $(libecontactlisteditor_la_OBJECTS) $(libecontactlisteditor_la_DEPENDENCIES) +- $(libecontactlisteditor_la_LINK) -rpath $(privsolibdir) $(libecontactlisteditor_la_OBJECTS) $(libecontactlisteditor_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libecontactlisteditor_la_LDFLAGS) $(libecontactlisteditor_la_OBJECTS) $(libecontactlisteditor_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -518,66 +535,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-contact-list-model.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++etspecDATA_INSTALL = $(INSTALL_DATA) + install-etspecDATA: $(etspec_DATA) + @$(NORMAL_INSTALL) +- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(etspecdir) + @list='$(etspec_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ +- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ ++ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ + done + + uninstall-etspecDATA: + @$(NORMAL_UNINSTALL) + @list='$(etspec_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(etspecdir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -586,7 +629,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -598,11 +640,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -625,23 +666,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -656,10 +702,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(etspecdir) $(DESTDIR)$(gladedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -681,7 +726,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -696,14 +741,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -711,20 +754,12 @@ + install-data-am: install-etspecDATA install-gladeDATA \ + install-privsolibLTLIBRARIES + +-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 +@@ -745,25 +780,21 @@ + + ps-am: + +-uninstall-am: uninstall-etspecDATA uninstall-gladeDATA \ ++uninstall-am: uninstall-etspecDATA uninstall-gladeDATA uninstall-info-am \ + uninstall-privsolibLTLIBRARIES + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-etspecDATA install-exec install-exec-am \ +- install-gladeDATA install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-etspecDATA \ ++ install-exec install-exec-am install-gladeDATA install-info \ ++ install-info-am install-man install-privsolibLTLIBRARIES \ + 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-etspecDATA uninstall-gladeDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-etspecDATA uninstall-gladeDATA uninstall-info-am \ + uninstall-privsolibLTLIBRARIES + + @EVO_MARSHAL_RULE@ +diff -ruN evolution-2.12.2.orig/addressbook/gui/Makefile.in evolution-2.12.2/addressbook/gui/Makefile.in +--- evolution-2.12.2.orig/addressbook/gui/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/gui/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/gui +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = merging contact-editor contact-list-editor widgets component ++subdir = addressbook/gui ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/gui/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/addressbook/gui/merging/Makefile.in evolution-2.12.2/addressbook/gui/merging/Makefile.in +--- evolution-2.12.2.orig/addressbook/gui/merging/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/gui/merging/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,53 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/gui/merging +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libeabbookmerging_la_LIBADD = +-am_libeabbookmerging_la_OBJECTS = eab-contact-compare.lo \ +- eab-contact-merging.lo +-libeabbookmerging_la_OBJECTS = $(am_libeabbookmerging_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libeabbookmerging_la_SOURCES) +-DIST_SOURCES = $(libeabbookmerging_la_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(gladedir)" +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -111,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -122,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -147,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -172,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -180,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -238,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -262,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -286,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -294,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -301,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -310,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -332,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -362,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -381,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DG_LOG_DOMAIN=\"eab-contact-merging\" \ +@@ -394,68 +394,79 @@ + -I$(top_srcdir)/addressbook \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + noinst_LTLIBRARIES = \ + libeabbookmerging.la + ++ + libeabbookmerging_la_SOURCES = \ + eab-contact-compare.c \ + eab-contact-compare.h \ + eab-contact-merging.c \ + eab-contact-merging.h + ++ + glade_DATA = eab-contact-duplicate-detected.glade \ + eab-contact-commit-duplicate-detected.glade + ++ + EXTRA_DIST = \ + $(glade_DATA) + ++subdir = addressbook/gui/merging ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libeabbookmerging_la_LDFLAGS = ++libeabbookmerging_la_LIBADD = ++am_libeabbookmerging_la_OBJECTS = eab-contact-compare.lo \ ++ eab-contact-merging.lo ++libeabbookmerging_la_OBJECTS = $(am_libeabbookmerging_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/eab-contact-compare.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-contact-merging.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libeabbookmerging_la_SOURCES) ++DATA = $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libeabbookmerging_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/merging/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/gui/merging/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libeabbookmerging.la: $(libeabbookmerging_la_OBJECTS) $(libeabbookmerging_la_DEPENDENCIES) +- $(LINK) $(libeabbookmerging_la_OBJECTS) $(libeabbookmerging_la_LIBADD) $(LIBS) ++ $(LINK) $(libeabbookmerging_la_LDFLAGS) $(libeabbookmerging_la_OBJECTS) $(libeabbookmerging_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -464,49 +475,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eab-contact-merging.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -515,7 +551,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -527,11 +562,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -554,23 +588,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -584,10 +623,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -607,7 +645,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -621,34 +659,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-gladeDATA + +-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 +@@ -669,23 +697,19 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA 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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA 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-gladeDATA ++ uninstall-am uninstall-gladeDATA 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 -ruN evolution-2.12.2.orig/addressbook/gui/widgets/Makefile.in evolution-2.12.2/addressbook/gui/widgets/Makefile.in +--- evolution-2.12.2.orig/addressbook/gui/widgets/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/gui/widgets/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,71 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/gui/widgets +-DIST_COMMON = $(eabinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libeabwidgets_la_LIBADD = +-am__objects_1 = +-am__objects_2 = $(am__objects_1) +-am__objects_3 = Evolution-Composer-common.lo \ +- Evolution-Composer-skels.lo Evolution-Composer-stubs.lo +-am__objects_4 = $(am__objects_3) +-am__objects_5 = $(am__objects_2) $(am__objects_4) +-am__objects_6 = eab-marshal.lo +-am_libeabwidgets_la_OBJECTS = $(am__objects_5) $(am__objects_6) \ +- eab-config.lo eab-contact-display.lo eab-gui-util.lo \ +- eab-menu.lo eab-popup.lo eab-popup-control.lo \ +- eab-vcard-control.lo e-minicard.lo e-minicard-label.lo \ +- e-minicard-view.lo e-minicard-view-widget.lo \ +- e-addressbook-reflow-adapter.lo e-addressbook-table-adapter.lo \ +- e-addressbook-model.lo e-addressbook-view.lo \ +- gal-view-minicard.lo gal-view-factory-minicard.lo +-libeabwidgets_la_OBJECTS = $(am_libeabwidgets_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libeabwidgets_la_SOURCES) +-DIST_SOURCES = $(libeabwidgets_la_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(ruledir)" \ +- "$(DESTDIR)$(eabincludedir)" +-etspecDATA_INSTALL = $(INSTALL_DATA) +-ruleDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(etspec_DATA) $(rule_DATA) +-eabincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(eabinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -130,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -141,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -166,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -191,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -199,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -281,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -305,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -313,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -320,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -329,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -351,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -381,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -400,14 +384,12 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + ruledir = $(privdatadir) + rule_DATA = addresstypes.xml ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"eab-widgets\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ +@@ -423,6 +405,7 @@ + -I$(top_builddir)/shell \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + CORBA_COMPOSER_SOURCE_H = \ + Evolution-Composer.h + +@@ -432,18 +415,23 @@ + Evolution-Composer-stubs.c + + CORBA_COMPOSER_IDL = $(srcdir)/../../../composer/Evolution-Composer.idl ++ + CORBA_SOURCE_H = $(CORBA_COMPOSER_SOURCE_H) + CORBA_SOURCE_C = $(CORBA_COMPOSER_SOURCE_C) + CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C) ++ + noinst_LTLIBRARIES = \ + libeabwidgets.la + ++ + eabincludedir = $(privincludedir)/addressbook/gui/widgets ++ + eabinclude_HEADERS = \ + eab-config.h \ + eab-menu.h \ + eab-popup.h + ++ + libeabwidgets_la_SOURCES = \ + $(CORBA_SOURCE) \ + $(MARSHAL_GENERATED) \ +@@ -481,6 +469,7 @@ + gal-view-factory-minicard.h + + ++ + #TREEVIEW_SOURCES= e-addressbook-treeview-adapter.c \ + # e-addressbook-treeview-adapter.h \ + # gal-view-factory-treeview.c \ +@@ -488,62 +477,106 @@ + # gal-view-treeview.c \ + # gal-view-treeview.h + MARSHAL_GENERATED = eab-marshal.c eab-marshal.h ++ + BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) ++ + etspec_DATA = e-addressbook-view.etspec ++ + EXTRA_DIST = \ + $(etspec_DATA) \ + eab-marshal.list \ + addresstypes.xml + ++subdir = addressbook/gui/widgets ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libeabwidgets_la_LDFLAGS = ++libeabwidgets_la_LIBADD = ++am__objects_1 = ++am__objects_2 = $(am__objects_1) ++am__objects_3 = Evolution-Composer-common.lo Evolution-Composer-skels.lo \ ++ Evolution-Composer-stubs.lo ++am__objects_4 = $(am__objects_3) ++am__objects_5 = $(am__objects_2) $(am__objects_4) ++am__objects_6 = eab-marshal.lo ++am_libeabwidgets_la_OBJECTS = $(am__objects_5) $(am__objects_6) \ ++ eab-config.lo eab-contact-display.lo eab-gui-util.lo \ ++ eab-menu.lo eab-popup.lo eab-popup-control.lo \ ++ eab-vcard-control.lo e-minicard.lo e-minicard-label.lo \ ++ e-minicard-view.lo e-minicard-view-widget.lo \ ++ e-addressbook-reflow-adapter.lo e-addressbook-table-adapter.lo \ ++ e-addressbook-model.lo e-addressbook-view.lo \ ++ gal-view-minicard.lo gal-view-factory-minicard.lo ++libeabwidgets_la_OBJECTS = $(am_libeabwidgets_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-Composer-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-reflow-adapter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-table-adapter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard-label.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard-view-widget.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-contact-display.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-gui-util.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-menu.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-popup-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-popup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-vcard-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-factory-minicard.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-minicard.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libeabwidgets_la_SOURCES) ++DATA = $(etspec_DATA) $(rule_DATA) ++ ++HEADERS = $(eabinclude_HEADERS) ++ ++DIST_COMMON = $(eabinclude_HEADERS) $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libeabwidgets_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/widgets/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/gui/widgets/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libeabwidgets.la: $(libeabwidgets_la_OBJECTS) $(libeabwidgets_la_DEPENDENCIES) +- $(LINK) $(libeabwidgets_la_OBJECTS) $(libeabwidgets_la_LIBADD) $(LIBS) ++ $(LINK) $(libeabwidgets_la_LDFLAGS) $(libeabwidgets_la_OBJECTS) $(libeabwidgets_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -571,83 +604,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-view-minicard.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++etspecDATA_INSTALL = $(INSTALL_DATA) + install-etspecDATA: $(etspec_DATA) + @$(NORMAL_INSTALL) +- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(etspecdir) + @list='$(etspec_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ +- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ ++ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ + done + + uninstall-etspecDATA: + @$(NORMAL_UNINSTALL) + @list='$(etspec_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(etspecdir)/$$f; \ + done ++ruleDATA_INSTALL = $(INSTALL_DATA) + install-ruleDATA: $(rule_DATA) + @$(NORMAL_INSTALL) +- test -z "$(ruledir)" || $(MKDIR_P) "$(DESTDIR)$(ruledir)" ++ $(mkinstalldirs) $(DESTDIR)$(ruledir) + @list='$(rule_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(ruleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ruledir)/$$f'"; \ +- $(ruleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ruledir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f"; \ ++ $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f; \ + done + + uninstall-ruleDATA: + @$(NORMAL_UNINSTALL) + @list='$(rule_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(ruledir)/$$f'"; \ +- rm -f "$(DESTDIR)$(ruledir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(ruledir)/$$f"; \ ++ rm -f $(DESTDIR)$(ruledir)/$$f; \ + done ++eabincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-eabincludeHEADERS: $(eabinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(eabincludedir)" || $(MKDIR_P) "$(DESTDIR)$(eabincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(eabincludedir) + @list='$(eabinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(eabincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eabincludedir)/$$f'"; \ +- $(eabincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eabincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(eabincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eabincludedir)/$$f"; \ ++ $(eabincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eabincludedir)/$$f; \ + done + + uninstall-eabincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(eabinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(eabincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(eabincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(eabincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(eabincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -656,7 +716,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -668,11 +727,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -695,23 +753,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -729,10 +792,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(ruledir)" "$(DESTDIR)$(eabincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(etspecdir) $(DESTDIR)$(ruledir) $(DESTDIR)$(eabincludedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -754,7 +816,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -769,14 +831,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -784,20 +844,12 @@ + install-data-am: install-eabincludeHEADERS install-etspecDATA \ + install-ruleDATA + +-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 +@@ -819,25 +871,21 @@ + ps-am: + + uninstall-am: uninstall-eabincludeHEADERS uninstall-etspecDATA \ +- uninstall-ruleDATA +- +-.MAKE: install-am install-strip ++ uninstall-info-am uninstall-ruleDATA + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \ +- 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 \ ++ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am \ + install-eabincludeHEADERS install-etspecDATA 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-ruleDATA 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-eabincludeHEADERS \ +- uninstall-etspecDATA uninstall-ruleDATA ++ install-exec-am install-info install-info-am install-man \ ++ install-ruleDATA 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-eabincludeHEADERS uninstall-etspecDATA \ ++ uninstall-info-am uninstall-ruleDATA + + + $(CORBA_COMPOSER_SOURCE_H): $(CORBA_COMPOSER_IDL) +diff -ruN evolution-2.12.2.orig/addressbook/importers/Makefile.in evolution-2.12.2/addressbook/importers/Makefile.in +--- evolution-2.12.2.orig/addressbook/importers/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/importers/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,63 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/importers +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_addressbook_importers_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/addressbook/util/libeabutil.la \ +- $(am__DEPENDENCIES_1) +-am_libevolution_addressbook_importers_la_OBJECTS = \ +- evolution-ldif-importer.lo evolution-vcard-importer.lo \ +- evolution-csv-importer.lo +-libevolution_addressbook_importers_la_OBJECTS = \ +- $(am_libevolution_addressbook_importers_la_OBJECTS) +-libevolution_addressbook_importers_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_addressbook_importers_la_LDFLAGS) $(LDFLAGS) -o \ +- $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_addressbook_importers_la_SOURCES) +-DIST_SOURCES = $(libevolution_addressbook_importers_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,15 +384,14 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + privsolib_LTLIBRARIES = \ + libevolution-addressbook-importers.la + ++ + INCLUDES = \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ +@@ -408,83 +401,96 @@ + -I$(top_builddir)/addressbook \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + libevolution_addressbook_importers_la_SOURCES = \ + evolution-ldif-importer.c \ + evolution-vcard-importer.c \ + evolution-csv-importer.c \ + evolution-addressbook-importers.h + ++ + libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED) ++ + libevolution_addressbook_importers_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(IMPORTERS_LIBS) + ++subdir = addressbook/importers ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libevolution_addressbook_importers_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/addressbook/util/libeabutil.la ++am_libevolution_addressbook_importers_la_OBJECTS = \ ++ evolution-ldif-importer.lo evolution-vcard-importer.lo \ ++ evolution-csv-importer.lo ++libevolution_addressbook_importers_la_OBJECTS = \ ++ $(am_libevolution_addressbook_importers_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/evolution-csv-importer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-ldif-importer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-vcard-importer.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_addressbook_importers_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_addressbook_importers_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/importers/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/importers/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-addressbook-importers.la: $(libevolution_addressbook_importers_la_OBJECTS) $(libevolution_addressbook_importers_la_DEPENDENCIES) +- $(libevolution_addressbook_importers_la_LINK) -rpath $(privsolibdir) $(libevolution_addressbook_importers_la_OBJECTS) $(libevolution_addressbook_importers_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_addressbook_importers_la_LDFLAGS) $(libevolution_addressbook_importers_la_OBJECTS) $(libevolution_addressbook_importers_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -494,25 +500,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evolution-vcard-importer.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -520,6 +538,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -528,7 +558,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -540,11 +569,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -567,23 +595,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +630,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -620,7 +652,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -634,34 +666,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -682,23 +704,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/addressbook/Makefile.in evolution-2.12.2/addressbook/Makefile.in +--- evolution-2.12.2.orig/addressbook/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,46 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(errordir)" +-errorDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = util printing importers gui tools conduit +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -103,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -114,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -139,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -164,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -172,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -230,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -254,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -278,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -286,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -293,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -302,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -324,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -354,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -373,77 +384,76 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + @ENABLE_PILOT_CONDUITS_TRUE@CONDUIT_SUBDIR = conduit ++ + SUBDIRS = util printing importers gui tools $(CONDUIT_SUBDIR) ++ + error_DATA = addressbook.error + errordir = $(privdatadir)/errors ++ + EXTRA_DIST = \ + ChangeLog.pre-1-4 \ + addressbook.error.xml + ++ + BUILT_SOURCES = $(error_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = addressbook ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(error_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++DIST_SUBDIRS = util printing importers gui tools conduit + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -453,13 +463,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -471,20 +475,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -505,7 +504,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -516,6 +515,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -524,22 +531,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -549,11 +553,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -576,23 +579,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -605,17 +613,13 @@ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -629,9 +633,8 @@ + all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(errordir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(errordir) ++ + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -653,7 +656,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -665,34 +668,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-errorDATA + +-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 +@@ -711,24 +705,26 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA ++uninstall-am: uninstall-errorDATA 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 dist-hook distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-errorDATA \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-errorDATA ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-errorDATA install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-recursive \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am uninstall-errorDATA \ ++ uninstall-info-am uninstall-info-recursive uninstall-recursive + + + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/addressbook/printing/Makefile.in evolution-2.12.2/addressbook/printing/Makefile.in +--- evolution-2.12.2.orig/addressbook/printing/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/printing/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,74 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = contact-print-test$(EXEEXT) \ +- contact-print-style-editor-test$(EXEEXT) +-subdir = addressbook/printing +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libecontactprint_la_LIBADD = +-am_libecontactprint_la_OBJECTS = e-contact-print-style-editor.lo \ +- e-contact-print.lo +-libecontactprint_la_OBJECTS = $(am_libecontactprint_la_OBJECTS) +-PROGRAMS = $(noinst_PROGRAMS) +-am_contact_print_style_editor_test_OBJECTS = \ +- test-contact-print-style-editor.$(OBJEXT) +-contact_print_style_editor_test_OBJECTS = \ +- $(am_contact_print_style_editor_test_OBJECTS) +-am__DEPENDENCIES_1 = +-contact_print_style_editor_test_DEPENDENCIES = libecontactprint.la \ +- $(top_builddir)/addressbook/util/libeabutil.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_contact_print_test_OBJECTS = test-print.$(OBJEXT) +-contact_print_test_OBJECTS = $(am_contact_print_test_OBJECTS) +-contact_print_test_DEPENDENCIES = libecontactprint.la \ +- $(top_builddir)/addressbook/util/libeabutil.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libecontactprint_la_SOURCES) \ +- $(contact_print_style_editor_test_SOURCES) \ +- $(contact_print_test_SOURCES) +-DIST_SOURCES = $(libecontactprint_la_SOURCES) \ +- $(contact_print_style_editor_test_SOURCES) \ +- $(contact_print_test_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(ecpsdir)" "$(DESTDIR)$(gladedir)" +-ecpsDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(ecps_DATA) $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -133,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -144,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -169,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -194,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -202,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -260,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -284,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -308,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -316,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -323,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -332,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -354,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -384,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -403,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + ecpsdir = $(privdatadir)/ecps + ecps_DATA = \ +@@ -415,9 +393,11 @@ + medbook.ecps \ + phonelist.ecps + ++ + glade_DATA = \ + e-contact-print.glade + ++ + INCLUDES = \ + $(GNOME_INCLUDEDIR) \ + -DG_LOG_DOMAIN=\"addressbook-printing\" \ +@@ -429,9 +409,11 @@ + -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + noinst_LTLIBRARIES = \ + libecontactprint.la + ++ + libecontactprint_la_SOURCES = \ + e-contact-print-style-editor.c \ + e-contact-print-style-editor.h \ +@@ -439,72 +421,111 @@ + e-contact-print.c \ + e-contact-print.h + ++ ++noinst_PROGRAMS = \ ++ contact-print-test \ ++ contact-print-style-editor-test ++ ++ + contact_print_test_SOURCES = \ + test-print.c + ++ + contact_print_test_LDADD = \ + libecontactprint.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + contact_print_style_editor_test_SOURCES = \ + test-contact-print-style-editor.c + ++ + contact_print_style_editor_test_LDADD = \ + libecontactprint.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + EXTRA_DIST = \ + $(glade_DATA) \ + $(ecps_DATA) + ++subdir = addressbook/printing ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libecontactprint_la_LDFLAGS = ++libecontactprint_la_LIBADD = ++am_libecontactprint_la_OBJECTS = e-contact-print-style-editor.lo \ ++ e-contact-print.lo ++libecontactprint_la_OBJECTS = $(am_libecontactprint_la_OBJECTS) ++noinst_PROGRAMS = contact-print-test$(EXEEXT) \ ++ contact-print-style-editor-test$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++ ++am_contact_print_style_editor_test_OBJECTS = \ ++ test-contact-print-style-editor.$(OBJEXT) ++contact_print_style_editor_test_OBJECTS = \ ++ $(am_contact_print_style_editor_test_OBJECTS) ++contact_print_style_editor_test_DEPENDENCIES = libecontactprint.la \ ++ $(top_builddir)/addressbook/util/libeabutil.la \ ++ $(top_builddir)/e-util/libeutil.la ++contact_print_style_editor_test_LDFLAGS = ++am_contact_print_test_OBJECTS = test-print.$(OBJEXT) ++contact_print_test_OBJECTS = $(am_contact_print_test_OBJECTS) ++contact_print_test_DEPENDENCIES = libecontactprint.la \ ++ $(top_builddir)/addressbook/util/libeabutil.la \ ++ $(top_builddir)/e-util/libeutil.la ++contact_print_test_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-contact-print-style-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-print.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-contact-print-style-editor.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-print.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libecontactprint_la_SOURCES) \ ++ $(contact_print_style_editor_test_SOURCES) \ ++ $(contact_print_test_SOURCES) ++DATA = $(ecps_DATA) $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libecontactprint_la_SOURCES) $(contact_print_style_editor_test_SOURCES) $(contact_print_test_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/printing/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/printing/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libecontactprint.la: $(libecontactprint_la_OBJECTS) $(libecontactprint_la_DEPENDENCIES) +- $(LINK) $(libecontactprint_la_OBJECTS) $(libecontactprint_la_LIBADD) $(LIBS) ++ $(LINK) $(libecontactprint_la_LDFLAGS) $(libecontactprint_la_OBJECTS) $(libecontactprint_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -514,13 +535,13 @@ + done + contact-print-style-editor-test$(EXEEXT): $(contact_print_style_editor_test_OBJECTS) $(contact_print_style_editor_test_DEPENDENCIES) + @rm -f contact-print-style-editor-test$(EXEEXT) +- $(LINK) $(contact_print_style_editor_test_OBJECTS) $(contact_print_style_editor_test_LDADD) $(LIBS) ++ $(LINK) $(contact_print_style_editor_test_LDFLAGS) $(contact_print_style_editor_test_OBJECTS) $(contact_print_style_editor_test_LDADD) $(LIBS) + contact-print-test$(EXEEXT): $(contact_print_test_OBJECTS) $(contact_print_test_DEPENDENCIES) + @rm -f contact-print-test$(EXEEXT) +- $(LINK) $(contact_print_test_OBJECTS) $(contact_print_test_LDADD) $(LIBS) ++ $(LINK) $(contact_print_test_LDFLAGS) $(contact_print_test_OBJECTS) $(contact_print_test_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -531,66 +552,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-print.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ecpsDATA_INSTALL = $(INSTALL_DATA) + install-ecpsDATA: $(ecps_DATA) + @$(NORMAL_INSTALL) +- test -z "$(ecpsdir)" || $(MKDIR_P) "$(DESTDIR)$(ecpsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(ecpsdir) + @list='$(ecps_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(ecpsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ecpsdir)/$$f'"; \ +- $(ecpsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ecpsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(ecpsDATA_INSTALL) $$d$$p $(DESTDIR)$(ecpsdir)/$$f"; \ ++ $(ecpsDATA_INSTALL) $$d$$p $(DESTDIR)$(ecpsdir)/$$f; \ + done + + uninstall-ecpsDATA: + @$(NORMAL_UNINSTALL) + @list='$(ecps_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(ecpsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(ecpsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(ecpsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(ecpsdir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -599,7 +646,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -611,11 +657,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -638,23 +683,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -668,10 +718,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(ecpsdir)" "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(ecpsdir) $(DESTDIR)$(gladedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -691,7 +740,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -705,34 +754,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-ecpsDATA install-gladeDATA + +-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 +@@ -753,24 +792,20 @@ + + ps-am: + +-uninstall-am: uninstall-ecpsDATA uninstall-gladeDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-ecpsDATA uninstall-gladeDATA uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + 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-ecpsDATA \ +- install-exec install-exec-am install-gladeDATA install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-ecpsDATA uninstall-gladeDATA ++ distclean-libtool distclean-tags distdir dvi dvi-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-ecpsDATA install-exec install-exec-am install-gladeDATA \ ++ 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-ecpsDATA \ ++ uninstall-gladeDATA 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 -ruN evolution-2.12.2.orig/addressbook/tools/Makefile.in evolution-2.12.2/addressbook/tools/Makefile.in +--- evolution-2.12.2.orig/addressbook/tools/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/tools/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,55 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-privlibexec_PROGRAMS = evolution-addressbook-export$(EXEEXT) +-subdir = addressbook/tools +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/csv2vcard.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = csv2vcard +-am__installdirs = "$(DESTDIR)$(privlibexecdir)" \ +- "$(DESTDIR)$(privlibexecdir)" +-privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(privlibexec_PROGRAMS) +-am_evolution_addressbook_export_OBJECTS = \ +- evolution-addressbook-export.$(OBJEXT) \ +- evolution-addressbook-export-list-cards.$(OBJEXT) \ +- evolution-addressbook-export-list-folders.$(OBJEXT) +-evolution_addressbook_export_OBJECTS = \ +- $(am_evolution_addressbook_export_OBJECTS) +-am__DEPENDENCIES_1 = +-evolution_addressbook_export_DEPENDENCIES = $(am__DEPENDENCIES_1) +-privlibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(privlibexec_SCRIPTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(evolution_addressbook_export_SOURCES) +-DIST_SOURCES = $(evolution_addressbook_export_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -113,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -124,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -149,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -174,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -182,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -240,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -264,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -288,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -296,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -303,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -312,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -334,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -364,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -383,16 +384,18 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + privlibexec_SCRIPTS = \ + csv2vcard \ + evolution-addressbook-clean + ++ ++privlibexec_PROGRAMS = \ ++ evolution-addressbook-export ++ ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-addressbook-tools\" \ + -I$(top_srcdir) \ +@@ -406,65 +409,83 @@ + -I$(top_builddir)/addressbook \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + evolution_addressbook_export_SOURCES = \ + evolution-addressbook-export.c \ + evolution-addressbook-export-list-cards.c \ + evolution-addressbook-export-list-folders.c \ + evolution-addressbook-export.h + ++ + evolution_addressbook_export_LDADD = \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + EXTRA_DIST = $(privlibexec_SCRIPTS) \ + evolution-addressbook-clean.in + ++ + CLEANFILES = evolution-addressbook-clean ++subdir = addressbook/tools ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = csv2vcard ++privlibexec_PROGRAMS = evolution-addressbook-export$(EXEEXT) ++PROGRAMS = $(privlibexec_PROGRAMS) ++ ++am_evolution_addressbook_export_OBJECTS = \ ++ evolution-addressbook-export.$(OBJEXT) \ ++ evolution-addressbook-export-list-cards.$(OBJEXT) \ ++ evolution-addressbook-export-list-folders.$(OBJEXT) ++evolution_addressbook_export_OBJECTS = \ ++ $(am_evolution_addressbook_export_OBJECTS) ++evolution_addressbook_export_DEPENDENCIES = ++evolution_addressbook_export_LDFLAGS = ++SCRIPTS = $(privlibexec_SCRIPTS) ++ ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-addressbook-export-list-cards.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-addressbook-export-list-folders.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-addressbook-export.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(evolution_addressbook_export_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am csv2vcard.in ++SOURCES = $(evolution_addressbook_export_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/tools/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/tools/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-csv2vcard: $(top_builddir)/config.status $(srcdir)/csv2vcard.in ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++csv2vcard: $(top_builddir)/config.status csv2vcard.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ++privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -472,8 +493,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ + done + + clean-privlibexecPROGRAMS: +@@ -484,16 +505,17 @@ + done + evolution-addressbook-export$(EXEEXT): $(evolution_addressbook_export_OBJECTS) $(evolution_addressbook_export_DEPENDENCIES) + @rm -f evolution-addressbook-export$(EXEEXT) +- $(LINK) $(evolution_addressbook_export_OBJECTS) $(evolution_addressbook_export_LDADD) $(LIBS) ++ $(LINK) $(evolution_addressbook_export_LDFLAGS) $(evolution_addressbook_export_OBJECTS) $(evolution_addressbook_export_LDADD) $(LIBS) ++privlibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) + install-privlibexecSCRIPTS: $(privlibexec_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) + @list='$(privlibexec_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(privlibexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- $(privlibexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(privlibexecdir)/$$f"; \ ++ echo " $(privlibexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ $(privlibexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(privlibexecdir)/$$f; \ + else :; fi; \ + done + +@@ -501,12 +523,12 @@ + @$(NORMAL_UNINSTALL) + @list='$(privlibexec_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ + done + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -516,25 +538,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evolution-addressbook-export.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -542,6 +576,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -550,7 +596,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -562,11 +607,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -589,23 +633,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -619,10 +668,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(PROGRAMS) $(SCRIPTS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(privlibexecdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) $(DESTDIR)$(privlibexecdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -643,7 +691,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -657,35 +705,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: + +-install-dvi: install-dvi-am +- +-install-exec-am: install-privlibexecPROGRAMS \ +- install-privlibexecSCRIPTS +- +-install-html: install-html-am ++install-exec-am: install-privlibexecPROGRAMS install-privlibexecSCRIPTS + + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -706,24 +743,20 @@ + + ps-am: + +-uninstall-am: uninstall-privlibexecPROGRAMS \ ++uninstall-am: uninstall-info-am uninstall-privlibexecPROGRAMS \ + uninstall-privlibexecSCRIPTS + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privlibexecPROGRAMS 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-privlibexecPROGRAMS \ +- install-privlibexecSCRIPTS install-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-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-privlibexecPROGRAMS install-privlibexecSCRIPTS \ + 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 \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ + uninstall-privlibexecPROGRAMS uninstall-privlibexecSCRIPTS + + +diff -ruN evolution-2.12.2.orig/addressbook/util/Makefile.in evolution-2.12.2/addressbook/util/Makefile.in +--- evolution-2.12.2.orig/addressbook/util/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/addressbook/util/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,57 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = addressbook/util +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libeabutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la +-am_libeabutil_la_OBJECTS = eab-marshal.lo eab-book-util.lo +-libeabutil_la_OBJECTS = $(am_libeabutil_la_OBJECTS) +-libeabutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libeabutil_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libeabutil_la_SOURCES) +-DIST_SOURCES = $(libeabutil_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -114,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -125,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -150,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -175,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -183,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -241,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -265,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -289,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -297,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -304,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -313,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -335,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -365,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -384,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DPREFIX=\"$(prefix)\" \ +@@ -402,90 +399,103 @@ + -I$(top_srcdir)/shell \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + privsolib_LTLIBRARIES = libeabutil.la ++ + libeabutil_la_SOURCES = \ + eab-marshal.c \ + eab-book-util.c \ + eab-book-util.h + ++ + libeabutil_la_LDFLAGS = $(NO_UNDEFINED) ++ + libeabutil_la_LIBADD = \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la + ++ + MARSHAL_GENERATED = eab-marshal.c eab-marshal.h ++ + BUILT_SOURCES = $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + eab-marshal.list + ++subdir = addressbook/util ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libeabutil_la_DEPENDENCIES = \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++am_libeabutil_la_OBJECTS = eab-marshal.lo eab-book-util.lo ++libeabutil_la_OBJECTS = $(am_libeabutil_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/eab-book-util.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eab-marshal.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libeabutil_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libeabutil_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/util/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu addressbook/util/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libeabutil.la: $(libeabutil_la_OBJECTS) $(libeabutil_la_DEPENDENCIES) +- $(libeabutil_la_LINK) -rpath $(privsolibdir) $(libeabutil_la_OBJECTS) $(libeabutil_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libeabutil_la_LDFLAGS) $(libeabutil_la_OBJECTS) $(libeabutil_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -494,25 +504,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eab-marshal.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -520,6 +542,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -528,7 +562,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -540,11 +573,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -567,23 +599,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -601,10 +638,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -626,7 +662,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -641,34 +677,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -689,23 +715,19 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privsolibLTLIBRARIES ctags dist-hook \ +- 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-privsolibLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ clean-libtool clean-privsolibLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-info-am \ + uninstall-privsolibLTLIBRARIES + + @EVO_MARSHAL_RULE@ +diff -ruN evolution-2.12.2.orig/art/Makefile.in evolution-2.12.2/art/Makefile.in +--- evolution-2.12.2.orig/art/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/art/Makefile.in 2007-12-05 15:54:51.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,45 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = art +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(icon16dir)" "$(DESTDIR)$(icon22dir)" \ +- "$(DESTDIR)$(icon24dir)" "$(DESTDIR)$(icon32dir)" \ +- "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(imagesdir)" \ +- "$(DESTDIR)$(svgicondir)" +-icon16DATA_INSTALL = $(INSTALL_DATA) +-icon22DATA_INSTALL = $(INSTALL_DATA) +-icon24DATA_INSTALL = $(INSTALL_DATA) +-icon32DATA_INSTALL = $(INSTALL_DATA) +-icon48DATA_INSTALL = $(INSTALL_DATA) +-imagesDATA_INSTALL = $(INSTALL_DATA) +-svgiconDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) \ +- $(icon48_DATA) $(images_DATA) $(svgicon_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -102,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -113,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -138,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -163,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -171,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -229,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -253,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -277,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -285,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -292,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -301,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -323,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -353,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -372,20 +384,21 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + icon16dir = $(datadir)/icons/hicolor/16x16/apps + icon16_DATA = 16x16/evolution.png ++ + icon22dir = $(datadir)/icons/hicolor/22x22/apps + icon22_DATA = 22x22/evolution.png ++ + icon24dir = $(datadir)/icons/hicolor/24x24/apps + icon24_DATA = 24x24/evolution.png ++ + icon32dir = $(datadir)/icons/hicolor/32x32/apps + icon32_DATA = 32x32/evolution.png ++ + icon48dir = $(datadir)/icons/hicolor/48x48/apps + icon48_DATA = \ + 48x48/preferences-autocompletion.png \ +@@ -395,9 +408,12 @@ + 48x48/preferences-mail-accounts.png \ + 48x48/preferences-mail.png + ++ + svgicondir = $(datadir)/icons/hicolor/scalable/apps + svgicon_DATA = scalable/evolution.svg ++ + gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor ++ + images_DATA = \ + evolution-contacts-mini.png \ + offline.png \ +@@ -407,6 +423,7 @@ + plus.png \ + minus.png + ++ + EXTRA_DIST = \ + ChangeLog \ + ChangeLog.pre-1-4 \ +@@ -423,162 +440,159 @@ + $(svgicon_DATA) \ + $(images_DATA) + ++subdir = art ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) \ ++ $(icon48_DATA) $(images_DATA) $(svgicon_DATA) ++ ++DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu art/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu art/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++icon16DATA_INSTALL = $(INSTALL_DATA) + install-icon16DATA: $(icon16_DATA) + @$(NORMAL_INSTALL) +- test -z "$(icon16dir)" || $(MKDIR_P) "$(DESTDIR)$(icon16dir)" ++ $(mkinstalldirs) $(DESTDIR)$(icon16dir) + @list='$(icon16_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(icon16DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon16dir)/$$f'"; \ +- $(icon16DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon16dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(icon16DATA_INSTALL) $$d$$p $(DESTDIR)$(icon16dir)/$$f"; \ ++ $(icon16DATA_INSTALL) $$d$$p $(DESTDIR)$(icon16dir)/$$f; \ + done + + uninstall-icon16DATA: + @$(NORMAL_UNINSTALL) + @list='$(icon16_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(icon16dir)/$$f'"; \ +- rm -f "$(DESTDIR)$(icon16dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(icon16dir)/$$f"; \ ++ rm -f $(DESTDIR)$(icon16dir)/$$f; \ + done ++icon22DATA_INSTALL = $(INSTALL_DATA) + install-icon22DATA: $(icon22_DATA) + @$(NORMAL_INSTALL) +- test -z "$(icon22dir)" || $(MKDIR_P) "$(DESTDIR)$(icon22dir)" ++ $(mkinstalldirs) $(DESTDIR)$(icon22dir) + @list='$(icon22_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(icon22DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon22dir)/$$f'"; \ +- $(icon22DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon22dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(icon22DATA_INSTALL) $$d$$p $(DESTDIR)$(icon22dir)/$$f"; \ ++ $(icon22DATA_INSTALL) $$d$$p $(DESTDIR)$(icon22dir)/$$f; \ + done + + uninstall-icon22DATA: + @$(NORMAL_UNINSTALL) + @list='$(icon22_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(icon22dir)/$$f'"; \ +- rm -f "$(DESTDIR)$(icon22dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(icon22dir)/$$f"; \ ++ rm -f $(DESTDIR)$(icon22dir)/$$f; \ + done ++icon24DATA_INSTALL = $(INSTALL_DATA) + install-icon24DATA: $(icon24_DATA) + @$(NORMAL_INSTALL) +- test -z "$(icon24dir)" || $(MKDIR_P) "$(DESTDIR)$(icon24dir)" ++ $(mkinstalldirs) $(DESTDIR)$(icon24dir) + @list='$(icon24_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(icon24DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon24dir)/$$f'"; \ +- $(icon24DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon24dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(icon24DATA_INSTALL) $$d$$p $(DESTDIR)$(icon24dir)/$$f"; \ ++ $(icon24DATA_INSTALL) $$d$$p $(DESTDIR)$(icon24dir)/$$f; \ + done + + uninstall-icon24DATA: + @$(NORMAL_UNINSTALL) + @list='$(icon24_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(icon24dir)/$$f'"; \ +- rm -f "$(DESTDIR)$(icon24dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(icon24dir)/$$f"; \ ++ rm -f $(DESTDIR)$(icon24dir)/$$f; \ + done ++icon32DATA_INSTALL = $(INSTALL_DATA) + install-icon32DATA: $(icon32_DATA) + @$(NORMAL_INSTALL) +- test -z "$(icon32dir)" || $(MKDIR_P) "$(DESTDIR)$(icon32dir)" ++ $(mkinstalldirs) $(DESTDIR)$(icon32dir) + @list='$(icon32_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(icon32DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon32dir)/$$f'"; \ +- $(icon32DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon32dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(icon32DATA_INSTALL) $$d$$p $(DESTDIR)$(icon32dir)/$$f"; \ ++ $(icon32DATA_INSTALL) $$d$$p $(DESTDIR)$(icon32dir)/$$f; \ + done + + uninstall-icon32DATA: + @$(NORMAL_UNINSTALL) + @list='$(icon32_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(icon32dir)/$$f'"; \ +- rm -f "$(DESTDIR)$(icon32dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(icon32dir)/$$f"; \ ++ rm -f $(DESTDIR)$(icon32dir)/$$f; \ + done ++icon48DATA_INSTALL = $(INSTALL_DATA) + install-icon48DATA: $(icon48_DATA) + @$(NORMAL_INSTALL) +- test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)" ++ $(mkinstalldirs) $(DESTDIR)$(icon48dir) + @list='$(icon48_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(icon48DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon48dir)/$$f'"; \ +- $(icon48DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon48dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(icon48DATA_INSTALL) $$d$$p $(DESTDIR)$(icon48dir)/$$f"; \ ++ $(icon48DATA_INSTALL) $$d$$p $(DESTDIR)$(icon48dir)/$$f; \ + done + + uninstall-icon48DATA: + @$(NORMAL_UNINSTALL) + @list='$(icon48_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(icon48dir)/$$f'"; \ +- rm -f "$(DESTDIR)$(icon48dir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(icon48dir)/$$f"; \ ++ rm -f $(DESTDIR)$(icon48dir)/$$f; \ + done ++imagesDATA_INSTALL = $(INSTALL_DATA) + install-imagesDATA: $(images_DATA) + @$(NORMAL_INSTALL) +- test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)" ++ $(mkinstalldirs) $(DESTDIR)$(imagesdir) + @list='$(images_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \ +- $(imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \ ++ $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \ + done + + uninstall-imagesDATA: + @$(NORMAL_UNINSTALL) + @list='$(images_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(imagesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(imagesdir)/$$f"; \ ++ rm -f $(DESTDIR)$(imagesdir)/$$f; \ + done ++svgiconDATA_INSTALL = $(INSTALL_DATA) + install-svgiconDATA: $(svgicon_DATA) + @$(NORMAL_INSTALL) +- test -z "$(svgicondir)" || $(MKDIR_P) "$(DESTDIR)$(svgicondir)" ++ $(mkinstalldirs) $(DESTDIR)$(svgicondir) + @list='$(svgicon_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(svgiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(svgicondir)/$$f'"; \ +- $(svgiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(svgicondir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(svgiconDATA_INSTALL) $$d$$p $(DESTDIR)$(svgicondir)/$$f"; \ ++ $(svgiconDATA_INSTALL) $$d$$p $(DESTDIR)$(svgicondir)/$$f; \ + done + + uninstall-svgiconDATA: + @$(NORMAL_UNINSTALL) + @list='$(svgicon_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(svgicondir)/$$f'"; \ +- rm -f "$(DESTDIR)$(svgicondir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(svgicondir)/$$f"; \ ++ rm -f $(DESTDIR)$(svgicondir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -586,23 +600,29 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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 \ ++ $(mkinstalldirs) $(distdir)/16x16 $(distdir)/22x22 $(distdir)/24x24 $(distdir)/32x32 $(distdir)/48x48 $(distdir)/scalable ++ @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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -616,10 +636,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(icon16dir)" "$(DESTDIR)$(icon22dir)" "$(DESTDIR)$(icon24dir)" "$(DESTDIR)$(icon32dir)" "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(svgicondir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(icon16dir) $(DESTDIR)$(icon22dir) $(DESTDIR)$(icon24dir) $(DESTDIR)$(icon32dir) $(DESTDIR)$(icon48dir) $(DESTDIR)$(imagesdir) $(DESTDIR)$(svgicondir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -639,7 +658,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -650,14 +669,12 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -668,20 +685,12 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +-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 +@@ -702,28 +711,23 @@ + + uninstall-am: uninstall-icon16DATA uninstall-icon22DATA \ + uninstall-icon24DATA uninstall-icon32DATA uninstall-icon48DATA \ +- uninstall-imagesDATA uninstall-svgiconDATA ++ uninstall-imagesDATA uninstall-info-am uninstall-svgiconDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + +-.MAKE: install-am install-data-am install-strip uninstall-am +- + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-hook install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-icon16DATA install-icon22DATA \ +- install-icon24DATA install-icon32DATA install-icon48DATA \ +- install-imagesDATA install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip install-svgiconDATA installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-hook \ ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-icon16DATA \ ++ install-icon22DATA install-icon24DATA install-icon32DATA \ ++ install-icon48DATA install-imagesDATA install-info \ ++ install-info-am install-man install-strip install-svgiconDATA \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-icon16DATA uninstall-icon22DATA uninstall-icon24DATA \ + uninstall-icon32DATA uninstall-icon48DATA uninstall-imagesDATA \ +- uninstall-svgiconDATA ++ uninstall-info-am uninstall-svgiconDATA + + + install-data-hook: update-icon-cache +diff -ruN evolution-2.12.2.orig/calendar/common/Makefile.in evolution-2.12.2/calendar/common/Makefile.in +--- evolution-2.12.2.orig/calendar/common/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/common/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,44 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/common +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libevolution_calendarprivate_la_LIBADD = +-am_libevolution_calendarprivate_la_OBJECTS = authentication.lo +-libevolution_calendarprivate_la_OBJECTS = \ +- $(am_libevolution_calendarprivate_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_calendarprivate_la_SOURCES) +-DIST_SOURCES = $(libevolution_calendarprivate_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -101,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -112,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -137,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -162,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -170,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -228,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -252,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -276,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -284,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -291,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -300,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -322,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -352,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -371,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + noinst_LTLIBRARIES = libevolution-calendarprivate.la ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"calendar-gui\" \ + -I$(top_builddir)/shell \ +@@ -388,57 +399,62 @@ + -I$(top_srcdir)/a11y/calendar \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + libevolution_calendarprivate_la_SOURCES = \ + authentication.c \ + authentication.h + ++subdir = calendar/common ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libevolution_calendarprivate_la_LDFLAGS = ++libevolution_calendarprivate_la_LIBADD = ++am_libevolution_calendarprivate_la_OBJECTS = authentication.lo ++libevolution_calendarprivate_la_OBJECTS = \ ++ $(am_libevolution_calendarprivate_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/authentication.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_calendarprivate_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_calendarprivate_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/common/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/common/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-calendarprivate.la: $(libevolution_calendarprivate_la_OBJECTS) $(libevolution_calendarprivate_la_DEPENDENCIES) +- $(LINK) $(libevolution_calendarprivate_la_OBJECTS) $(libevolution_calendarprivate_la_LIBADD) $(LIBS) ++ $(LINK) $(libevolution_calendarprivate_la_LDFLAGS) $(libevolution_calendarprivate_la_OBJECTS) $(libevolution_calendarprivate_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -446,25 +462,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authentication.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -472,6 +500,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -480,7 +520,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -492,11 +531,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -519,23 +557,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -549,6 +592,7 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: + install: install-am + install-exec: install-exec-am +@@ -569,7 +613,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -583,34 +627,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -631,22 +665,18 @@ + + 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 \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am install-man \ + install-strip installcheck 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 ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool 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 -ruN evolution-2.12.2.orig/calendar/conduits/calendar/Makefile.in evolution-2.12.2/calendar/conduits/calendar/Makefile.in +--- evolution-2.12.2.orig/calendar/conduits/calendar/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/calendar/conduits/calendar/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,64 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/conduits/calendar +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privconduitdir)" \ +- "$(DESTDIR)$(conduitdir)" +-privconduitLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privconduit_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libecalendar_conduit_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/e-util/libeconduit.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ +- $(am__DEPENDENCIES_1) +-am_libecalendar_conduit_la_OBJECTS = calendar-conduit.lo +-libecalendar_conduit_la_OBJECTS = \ +- $(am_libecalendar_conduit_la_OBJECTS) +-libecalendar_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libecalendar_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libecalendar_conduit_la_SOURCES) +-DIST_SOURCES = $(libecalendar_conduit_la_SOURCES) +-conduitDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(conduit_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -122,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -133,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -158,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -183,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -191,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -249,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -273,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -297,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -305,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -312,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -321,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -343,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -373,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -392,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)/e-util \ +@@ -410,10 +399,13 @@ + + # Calendar Conduit + privconduit_LTLIBRARIES = libecalendar_conduit.la ++ + libecalendar_conduit_la_SOURCES = \ + calendar-conduit.c + ++ + libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + libecalendar_conduit_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeconduit.la \ +@@ -421,79 +413,91 @@ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + ++ + conduitdir = $(datadir)/gnome-pilot/conduits/ + conduit_DATA = e-calendar.conduit ++ + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + e-calendar.conduit.in + ++subdir = calendar/conduits/calendar ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privconduit_LTLIBRARIES) ++ ++libecalendar_conduit_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/e-util/libeconduit.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la ++am_libecalendar_conduit_la_OBJECTS = calendar-conduit.lo ++libecalendar_conduit_la_OBJECTS = $(am_libecalendar_conduit_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-conduit.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libecalendar_conduit_la_SOURCES) ++DATA = $(conduit_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libecalendar_conduit_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/calendar/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/conduits/calendar/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privconduitLTLIBRARIES_INSTALL = $(INSTALL) + install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ + else :; fi; \ + done + + uninstall-privconduitLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ + done + + clean-privconduitLTLIBRARIES: + -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libecalendar_conduit.la: $(libecalendar_conduit_la_OBJECTS) $(libecalendar_conduit_la_DEPENDENCIES) +- $(libecalendar_conduit_la_LINK) -rpath $(privconduitdir) $(libecalendar_conduit_la_OBJECTS) $(libecalendar_conduit_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privconduitdir) $(libecalendar_conduit_la_LDFLAGS) $(libecalendar_conduit_la_OBJECTS) $(libecalendar_conduit_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -501,49 +505,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-conduit.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++conduitDATA_INSTALL = $(INSTALL_DATA) + install-conduitDATA: $(conduit_DATA) + @$(NORMAL_INSTALL) +- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(conduitdir) + @list='$(conduit_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ +- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ ++ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ + done + + uninstall-conduitDATA: + @$(NORMAL_UNINSTALL) + @list='$(conduit_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ ++ rm -f $(DESTDIR)$(conduitdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -552,7 +581,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -564,11 +592,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -591,23 +618,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -625,10 +657,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -650,7 +681,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -665,34 +696,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-conduitDATA install-privconduitLTLIBRARIES + +-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 +@@ -713,25 +734,21 @@ + + ps-am: + +-uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-conduitDATA uninstall-info-am \ ++ uninstall-privconduitLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-conduitDATA \ +- 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-privconduitLTLIBRARIES install-ps \ +- install-ps-am 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-conduitDATA \ +- uninstall-privconduitLTLIBRARIES ++ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-conduitDATA install-data install-data-am \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ ++ uninstall-info-am uninstall-privconduitLTLIBRARIES + + + e-calendar.conduit: e-calendar.conduit.in +diff -ruN evolution-2.12.2.orig/calendar/conduits/common/Makefile.in evolution-2.12.2/calendar/conduits/common/Makefile.in +--- evolution-2.12.2.orig/calendar/conduits/common/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/calendar/conduits/common/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,64 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/conduits/common +-DIST_COMMON = $(ecalendar_common_conduitinclude_HEADERS) \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privconduitdir)" \ +- "$(DESTDIR)$(ecalendar_common_conduitincludedir)" +-privconduitLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privconduit_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libecalendar_common_conduit_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/e-util/libeconduit.la $(am__DEPENDENCIES_1) +-am_libecalendar_common_conduit_la_OBJECTS = \ +- libecalendar-common-conduit.lo +-libecalendar_common_conduit_la_OBJECTS = \ +- $(am_libecalendar_common_conduit_la_OBJECTS) +-libecalendar_common_conduit_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(libecalendar_common_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libecalendar_common_conduit_la_SOURCES) +-DIST_SOURCES = $(libecalendar_common_conduit_la_SOURCES) +-ecalendar_common_conduitincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(ecalendar_common_conduitinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -122,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -133,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -158,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -183,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -191,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -249,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -273,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -297,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -305,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -312,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -321,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -343,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -373,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -392,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)/e-util \ +@@ -406,84 +395,98 @@ + + # Calendar Conduit library + privconduit_LTLIBRARIES = libecalendar_common_conduit.la ++ + ecalendar_common_conduitincludedir = $(privincludedir)/calendar/conduits/common ++ + ecalendar_common_conduitinclude_HEADERS = \ + libecalendar-common-conduit.h + ++ + libecalendar_common_conduit_la_SOURCES = \ + libecalendar-common-conduit.c + ++ + libecalendar_common_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + libecalendar_common_conduit_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeconduit.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + ++subdir = calendar/conduits/common ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privconduit_LTLIBRARIES) ++ ++libecalendar_common_conduit_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/e-util/libeconduit.la ++am_libecalendar_common_conduit_la_OBJECTS = \ ++ libecalendar-common-conduit.lo ++libecalendar_common_conduit_la_OBJECTS = \ ++ $(am_libecalendar_common_conduit_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libecalendar-common-conduit.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libecalendar_common_conduit_la_SOURCES) ++HEADERS = $(ecalendar_common_conduitinclude_HEADERS) ++ ++DIST_COMMON = $(ecalendar_common_conduitinclude_HEADERS) \ ++ $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libecalendar_common_conduit_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/common/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/conduits/common/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privconduitLTLIBRARIES_INSTALL = $(INSTALL) + install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ + else :; fi; \ + done + + uninstall-privconduitLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ + done + + clean-privconduitLTLIBRARIES: + -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libecalendar_common_conduit.la: $(libecalendar_common_conduit_la_OBJECTS) $(libecalendar_common_conduit_la_DEPENDENCIES) +- $(libecalendar_common_conduit_la_LINK) -rpath $(privconduitdir) $(libecalendar_common_conduit_la_OBJECTS) $(libecalendar_common_conduit_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privconduitdir) $(libecalendar_common_conduit_la_LDFLAGS) $(libecalendar_common_conduit_la_OBJECTS) $(libecalendar_common_conduit_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -491,49 +494,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libecalendar-common-conduit.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ecalendar_common_conduitincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-ecalendar_common_conduitincludeHEADERS: $(ecalendar_common_conduitinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(ecalendar_common_conduitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ecalendar_common_conduitincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(ecalendar_common_conduitincludedir) + @list='$(ecalendar_common_conduitinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(ecalendar_common_conduitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f'"; \ +- $(ecalendar_common_conduitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(ecalendar_common_conduitincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ ++ $(ecalendar_common_conduitincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f; \ + done + + uninstall-ecalendar_common_conduitincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(ecalendar_common_conduitinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -542,7 +570,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -554,11 +581,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -581,23 +607,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -611,10 +642,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(ecalendar_common_conduitincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(ecalendar_common_conduitincludedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -634,7 +664,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -648,14 +678,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -663,20 +691,12 @@ + install-data-am: install-ecalendar_common_conduitincludeHEADERS \ + install-privconduitLTLIBRARIES + +-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 +@@ -698,25 +718,22 @@ + ps-am: + + uninstall-am: uninstall-ecalendar_common_conduitincludeHEADERS \ +- uninstall-privconduitLTLIBRARIES +- +-.MAKE: install-am install-strip ++ uninstall-info-am uninstall-privconduitLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privconduitLTLIBRARIES 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-ecalendar_common_conduitincludeHEADERS \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-privconduitLTLIBRARIES install-ps \ +- install-ps-am 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-ecalendar_common_conduitincludeHEADERS \ +- uninstall-privconduitLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am \ ++ install-ecalendar_common_conduitincludeHEADERS install-exec \ ++ install-exec-am install-info install-info-am install-man \ ++ install-privconduitLTLIBRARIES 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-ecalendar_common_conduitincludeHEADERS \ ++ uninstall-info-am uninstall-privconduitLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/calendar/conduits/Makefile.in evolution-2.12.2/calendar/conduits/Makefile.in +--- evolution-2.12.2.orig/calendar/conduits/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/conduits/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/conduits +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = common calendar memo todo ++subdir = calendar/conduits ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/conduits/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/calendar/conduits/memo/Makefile.in evolution-2.12.2/calendar/conduits/memo/Makefile.in +--- evolution-2.12.2.orig/calendar/conduits/memo/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/calendar/conduits/memo/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/conduits/memo +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privconduitdir)" \ +- "$(DESTDIR)$(conduitdir)" +-privconduitLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privconduit_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libememo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/e-util/libeconduit.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ +- $(am__DEPENDENCIES_1) +-am_libememo_conduit_la_OBJECTS = memo-conduit.lo +-libememo_conduit_la_OBJECTS = $(am_libememo_conduit_la_OBJECTS) +-libememo_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libememo_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libememo_conduit_la_SOURCES) +-DIST_SOURCES = $(libememo_conduit_la_SOURCES) +-conduitDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(conduit_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)/e-util \ +@@ -408,10 +399,13 @@ + + # Memo Conduit + privconduit_LTLIBRARIES = libememo_conduit.la ++ + libememo_conduit_la_SOURCES = \ + memo-conduit.c + ++ + libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + libememo_conduit_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeconduit.la \ +@@ -419,79 +413,90 @@ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + ++ + conduitdir = $(datadir)/gnome-pilot/conduits/ + conduit_DATA = e-memo.conduit ++ + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + e-memo.conduit.in + ++subdir = calendar/conduits/memo ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privconduit_LTLIBRARIES) ++ ++libememo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/e-util/libeconduit.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la ++am_libememo_conduit_la_OBJECTS = memo-conduit.lo ++libememo_conduit_la_OBJECTS = $(am_libememo_conduit_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/memo-conduit.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libememo_conduit_la_SOURCES) ++DATA = $(conduit_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libememo_conduit_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/memo/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/conduits/memo/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privconduitLTLIBRARIES_INSTALL = $(INSTALL) + install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ + else :; fi; \ + done + + uninstall-privconduitLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ + done + + clean-privconduitLTLIBRARIES: + -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libememo_conduit.la: $(libememo_conduit_la_OBJECTS) $(libememo_conduit_la_DEPENDENCIES) +- $(libememo_conduit_la_LINK) -rpath $(privconduitdir) $(libememo_conduit_la_OBJECTS) $(libememo_conduit_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privconduitdir) $(libememo_conduit_la_LDFLAGS) $(libememo_conduit_la_OBJECTS) $(libememo_conduit_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -499,49 +504,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memo-conduit.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++conduitDATA_INSTALL = $(INSTALL_DATA) + install-conduitDATA: $(conduit_DATA) + @$(NORMAL_INSTALL) +- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(conduitdir) + @list='$(conduit_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ +- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ ++ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ + done + + uninstall-conduitDATA: + @$(NORMAL_UNINSTALL) + @list='$(conduit_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ ++ rm -f $(DESTDIR)$(conduitdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -550,7 +580,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -562,11 +591,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -589,23 +617,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -623,10 +656,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -648,7 +680,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -663,34 +695,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-conduitDATA install-privconduitLTLIBRARIES + +-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 +@@ -711,25 +733,21 @@ + + ps-am: + +-uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-conduitDATA uninstall-info-am \ ++ uninstall-privconduitLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-conduitDATA \ +- 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-privconduitLTLIBRARIES install-ps \ +- install-ps-am 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-conduitDATA \ +- uninstall-privconduitLTLIBRARIES ++ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-conduitDATA install-data install-data-am \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ ++ uninstall-info-am uninstall-privconduitLTLIBRARIES + + + e-memo.conduit: e-memo.conduit.in +diff -ruN evolution-2.12.2.orig/calendar/conduits/todo/Makefile.in evolution-2.12.2/calendar/conduits/todo/Makefile.in +--- evolution-2.12.2.orig/calendar/conduits/todo/Makefile.in 2007-12-05 15:50:02.000000000 +0100 ++++ evolution-2.12.2/calendar/conduits/todo/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/conduits/todo +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privconduitdir)" \ +- "$(DESTDIR)$(conduitdir)" +-privconduitLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privconduit_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libetodo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/e-util/libeconduit.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ +- $(am__DEPENDENCIES_1) +-am_libetodo_conduit_la_OBJECTS = todo-conduit.lo +-libetodo_conduit_la_OBJECTS = $(am_libetodo_conduit_la_OBJECTS) +-libetodo_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libetodo_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libetodo_conduit_la_SOURCES) +-DIST_SOURCES = $(libetodo_conduit_la_SOURCES) +-conduitDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(conduit_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)/e-util \ +@@ -408,10 +399,13 @@ + + # ToDo Conduit + privconduit_LTLIBRARIES = libetodo_conduit.la ++ + libetodo_conduit_la_SOURCES = \ + todo-conduit.c + ++ + libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + libetodo_conduit_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeconduit.la \ +@@ -419,79 +413,90 @@ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + ++ + conduitdir = $(datadir)/gnome-pilot/conduits/ + conduit_DATA = e-todo.conduit ++ + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + e-todo.conduit.in + ++subdir = calendar/conduits/todo ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privconduit_LTLIBRARIES) ++ ++libetodo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/e-util/libeconduit.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la ++am_libetodo_conduit_la_OBJECTS = todo-conduit.lo ++libetodo_conduit_la_OBJECTS = $(am_libetodo_conduit_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/todo-conduit.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libetodo_conduit_la_SOURCES) ++DATA = $(conduit_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libetodo_conduit_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/todo/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/conduits/todo/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privconduitLTLIBRARIES_INSTALL = $(INSTALL) + install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ + else :; fi; \ + done + + uninstall-privconduitLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ + done + + clean-privconduitLTLIBRARIES: + -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) + @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libetodo_conduit.la: $(libetodo_conduit_la_OBJECTS) $(libetodo_conduit_la_DEPENDENCIES) +- $(libetodo_conduit_la_LINK) -rpath $(privconduitdir) $(libetodo_conduit_la_OBJECTS) $(libetodo_conduit_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privconduitdir) $(libetodo_conduit_la_LDFLAGS) $(libetodo_conduit_la_OBJECTS) $(libetodo_conduit_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -499,49 +504,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/todo-conduit.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++conduitDATA_INSTALL = $(INSTALL_DATA) + install-conduitDATA: $(conduit_DATA) + @$(NORMAL_INSTALL) +- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" ++ $(mkinstalldirs) $(DESTDIR)$(conduitdir) + @list='$(conduit_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ +- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ ++ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ + done + + uninstall-conduitDATA: + @$(NORMAL_UNINSTALL) + @list='$(conduit_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ ++ rm -f $(DESTDIR)$(conduitdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -550,7 +580,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -562,11 +591,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -589,23 +617,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -623,10 +656,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -648,7 +680,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -663,34 +695,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-conduitDATA install-privconduitLTLIBRARIES + +-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 +@@ -711,25 +733,21 @@ + + ps-am: + +-uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-conduitDATA uninstall-info-am \ ++ uninstall-privconduitLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-conduitDATA \ +- 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-privconduitLTLIBRARIES install-ps \ +- install-ps-am 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-conduitDATA \ +- uninstall-privconduitLTLIBRARIES ++ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-conduitDATA install-data install-data-am \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ ++ uninstall-info-am uninstall-privconduitLTLIBRARIES + + + e-todo.conduit: e-todo.conduit.in +diff -ruN evolution-2.12.2.orig/calendar/gui/alarm-notify/Makefile.in evolution-2.12.2/calendar/gui/alarm-notify/Makefile.in +--- evolution-2.12.2.orig/calendar/gui/alarm-notify/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/gui/alarm-notify/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,69 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-privlibexec_PROGRAMS = evolution-alarm-notify$(EXEEXT) +-subdir = calendar/gui/alarm-notify +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(privlibexecdir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(serverdir)" +-privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(privlibexec_PROGRAMS) +-am__objects_1 = evolution-calendar-common.$(OBJEXT) \ +- evolution-calendar-skels.$(OBJEXT) \ +- evolution-calendar-stubs.$(OBJEXT) +-am__objects_2 = +-am__objects_3 = $(am__objects_1) $(am__objects_2) +-am_evolution_alarm_notify_OBJECTS = $(am__objects_3) alarm.$(OBJEXT) \ +- alarm-notify.$(OBJEXT) alarm-notify-dialog.$(OBJEXT) \ +- alarm-queue.$(OBJEXT) config-data.$(OBJEXT) \ +- notify-main.$(OBJEXT) util.$(OBJEXT) +-evolution_alarm_notify_OBJECTS = $(am_evolution_alarm_notify_OBJECTS) +-am__DEPENDENCIES_1 = +-evolution_alarm_notify_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(evolution_alarm_notify_SOURCES) +-DIST_SOURCES = $(evolution_alarm_notify_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-gladeDATA_INSTALL = $(INSTALL_DATA) +-serverDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) $(server_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -127,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -138,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -163,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -188,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -196,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -254,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -278,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -302,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -310,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -317,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -326,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -348,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -378,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -397,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + CORBA_GENERATED_H = \ + evolution-calendar.h +@@ -412,8 +396,12 @@ + evolution-calendar-stubs.c + + CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H) ++ + idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl + idl_flags = $(IDL_INCLUDES) ++ ++privlibexec_PROGRAMS = evolution-alarm-notify ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ + -I$(top_srcdir) \ +@@ -424,9 +412,11 @@ + -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + glade_DATA = \ + alarm-notify.glade + ++ + evolution_alarm_notify_SOURCES = \ + $(CORBA_GENERATED) \ + alarm.c \ +@@ -443,6 +433,7 @@ + util.c \ + util.h + ++ + evolution_alarm_notify_LDADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ +@@ -450,59 +441,86 @@ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in + server_DATA = $(server_in_files:.server.in.in=.server) ++ + EXTRA_DIST = \ + $(server_in_files) \ + $(glade_DATA) + ++ + BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = calendar/gui/alarm-notify ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++privlibexec_PROGRAMS = evolution-alarm-notify$(EXEEXT) ++PROGRAMS = $(privlibexec_PROGRAMS) ++ ++am__objects_1 = evolution-calendar-common.$(OBJEXT) \ ++ evolution-calendar-skels.$(OBJEXT) \ ++ evolution-calendar-stubs.$(OBJEXT) ++am__objects_2 = ++am__objects_3 = $(am__objects_1) $(am__objects_2) ++am_evolution_alarm_notify_OBJECTS = $(am__objects_3) alarm.$(OBJEXT) \ ++ alarm-notify.$(OBJEXT) alarm-notify-dialog.$(OBJEXT) \ ++ alarm-queue.$(OBJEXT) config-data.$(OBJEXT) \ ++ notify-main.$(OBJEXT) util.$(OBJEXT) ++evolution_alarm_notify_OBJECTS = $(am_evolution_alarm_notify_OBJECTS) ++evolution_alarm_notify_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la ++evolution_alarm_notify_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alarm-notify-dialog.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/alarm-notify.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/alarm-queue.Po ./$(DEPDIR)/alarm.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/config-data.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-common.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-skels.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-stubs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/notify-main.Po ./$(DEPDIR)/util.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(evolution_alarm_notify_SOURCES) ++DATA = $(glade_DATA) $(server_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(evolution_alarm_notify_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/gui/alarm-notify/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/gui/alarm-notify/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -510,8 +528,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ + done + + clean-privlibexecPROGRAMS: +@@ -522,10 +540,10 @@ + done + evolution-alarm-notify$(EXEEXT): $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_DEPENDENCIES) + @rm -f evolution-alarm-notify$(EXEEXT) +- $(LINK) $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_LDADD) $(LIBS) ++ $(LINK) $(evolution_alarm_notify_LDFLAGS) $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -542,66 +560,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++serverDATA_INSTALL = $(INSTALL_DATA) + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" ++ $(mkinstalldirs) $(DESTDIR)$(serverdir) + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ +- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ ++ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ + done + + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ++ rm -f $(DESTDIR)$(serverdir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -610,7 +654,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -622,11 +665,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -649,23 +691,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -683,10 +730,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(PROGRAMS) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(serverdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(serverdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -708,7 +754,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -723,34 +769,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-gladeDATA install-serverDATA + +-install-dvi: install-dvi-am +- + install-exec-am: install-privlibexecPROGRAMS + +-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 +@@ -771,26 +807,22 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-privlibexecPROGRAMS \ +- uninstall-serverDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-privlibexecPROGRAMS uninstall-serverDATA + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privlibexecPROGRAMS ctags dist-hook \ +- 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-gladeDATA install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-privlibexecPROGRAMS install-ps \ +- install-ps-am install-serverDATA 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-gladeDATA \ +- uninstall-privlibexecPROGRAMS uninstall-serverDATA ++ clean-libtool clean-privlibexecPROGRAMS ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-privlibexecPROGRAMS install-serverDATA \ ++ 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-gladeDATA \ ++ uninstall-info-am uninstall-privlibexecPROGRAMS \ ++ uninstall-serverDATA + + + $(CORBA_GENERATED_H): $(idls) +diff -ruN evolution-2.12.2.orig/calendar/gui/dialogs/Makefile.in evolution-2.12.2/calendar/gui/dialogs/Makefile.in +--- evolution-2.12.2.orig/calendar/gui/dialogs/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/gui/dialogs/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/gui/dialogs +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libcal_dialogs_la_DEPENDENCIES = \ +- $(top_builddir)/addressbook/util/libeabutil.la +-am_libcal_dialogs_la_OBJECTS = alarm-dialog.lo alarm-list-dialog.lo \ +- cal-attachment-select-file.lo cal-prefs-dialog.lo \ +- calendar-setup.lo cancel-comp.lo changed-comp.lo \ +- comp-editor.lo comp-editor-page.lo comp-editor-util.lo \ +- copy-source-dialog.lo delete-comp.lo delete-error.lo \ +- e-delegate-dialog.lo e-send-options-utils.lo event-editor.lo \ +- event-page.lo memo-editor.lo memo-page.lo recurrence-page.lo \ +- recur-comp.lo save-comp.lo schedule-page.lo \ +- select-source-dialog.lo send-comp.lo task-editor.lo \ +- task-details-page.lo task-page.lo +-libcal_dialogs_la_OBJECTS = $(am_libcal_dialogs_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libcal_dialogs_la_SOURCES) +-DIST_SOURCES = $(libcal_dialogs_la_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(gladedir)" +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DG_LOG_DOMAIN=\"calendar-gui\" \ +@@ -411,10 +402,13 @@ + -DPREFIX=\""$(prefix)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + noinst_LTLIBRARIES = libcal-dialogs.la ++ + libcal_dialogs_la_LIBADD = \ + $(top_builddir)/addressbook/util/libeabutil.la + ++ + libcal_dialogs_la_SOURCES = \ + $(IDL_GENERATED) \ + alarm-dialog.c \ +@@ -474,6 +468,7 @@ + task-page.c \ + task-page.h + ++ + glade_DATA = \ + alarm-dialog.glade \ + alarm-list-dialog.glade \ +@@ -487,57 +482,101 @@ + task-details-page.glade \ + task-page.glade + ++ + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + $(glade_DATA) + ++subdir = calendar/gui/dialogs ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libcal_dialogs_la_LDFLAGS = ++libcal_dialogs_la_DEPENDENCIES = \ ++ $(top_builddir)/addressbook/util/libeabutil.la ++am_libcal_dialogs_la_OBJECTS = $(am__objects_1) alarm-dialog.lo \ ++ alarm-list-dialog.lo cal-attachment-select-file.lo \ ++ cal-prefs-dialog.lo calendar-setup.lo cancel-comp.lo \ ++ changed-comp.lo comp-editor.lo comp-editor-page.lo \ ++ comp-editor-util.lo copy-source-dialog.lo delete-comp.lo \ ++ delete-error.lo e-delegate-dialog.lo e-send-options-utils.lo \ ++ event-editor.lo event-page.lo memo-editor.lo memo-page.lo \ ++ recurrence-page.lo recur-comp.lo save-comp.lo schedule-page.lo \ ++ select-source-dialog.lo send-comp.lo task-editor.lo \ ++ task-details-page.lo task-page.lo ++libcal_dialogs_la_OBJECTS = $(am_libcal_dialogs_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alarm-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/alarm-list-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cal-attachment-select-file.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cal-prefs-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-setup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cancel-comp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/changed-comp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor-util.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/copy-source-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/delete-comp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/delete-error.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-delegate-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-send-options-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/event-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/event-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/memo-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/memo-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/recur-comp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/recurrence-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/save-comp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/schedule-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/select-source-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/send-comp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/task-details-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/task-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/task-page.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libcal_dialogs_la_SOURCES) ++DATA = $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libcal_dialogs_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/gui/dialogs/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/gui/dialogs/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libcal-dialogs.la: $(libcal_dialogs_la_OBJECTS) $(libcal_dialogs_la_DEPENDENCIES) +- $(LINK) $(libcal_dialogs_la_OBJECTS) $(libcal_dialogs_la_LIBADD) $(LIBS) ++ $(LINK) $(libcal_dialogs_la_LDFLAGS) $(libcal_dialogs_la_OBJECTS) $(libcal_dialogs_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -572,49 +611,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task-page.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -623,7 +687,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -635,11 +698,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -662,23 +724,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -695,10 +762,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -719,7 +785,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -733,34 +799,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-gladeDATA + +-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 +@@ -781,23 +837,19 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \ +- 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-gladeDATA install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-gladeDATA ++ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA 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-gladeDATA uninstall-info-am + + + dist-hook: +diff -ruN evolution-2.12.2.orig/calendar/gui/Makefile.in evolution-2.12.2/calendar/gui/Makefile.in +--- evolution-2.12.2.orig/calendar/gui/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/gui/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,127 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/gui +-DIST_COMMON = $(ecalendarinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(etspecdir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(ruledir)" \ +- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" \ +- "$(DESTDIR)$(ecalendarincludedir)" +-componentLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(component_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_calendar_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/widgets/menus/libmenus.la \ +- $(top_builddir)/shell/libeshell.la \ +- $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ +- $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ +- $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ +- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/filter/libfilter.la \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-am__objects_1 = evolution-calendar-common.lo \ +- evolution-calendar-skels.lo evolution-calendar-stubs.lo +-am__objects_2 = +-am__objects_3 = $(am__objects_1) $(am__objects_2) +-am__objects_4 = Evolution-Composer-common.lo \ +- Evolution-Composer-skels.lo Evolution-Composer-stubs.lo +-am__objects_5 = $(am__objects_4) $(am__objects_2) +-am__objects_6 = $(am__objects_3) $(am__objects_5) +-am__objects_7 = e-calendar-marshal.lo +-am_libevolution_calendar_la_OBJECTS = $(am__objects_6) \ +- $(am__objects_7) cal-search-bar.lo calendar-config.lo \ +- calendar-commands.lo calendar-component.lo calendar-view.lo \ +- calendar-view-factory.lo comp-editor-factory.lo comp-util.lo \ +- control-factory.lo e-alarm-list.lo e-cal-component-preview.lo \ +- e-cal-component-memo-preview.lo e-cal-config.lo e-cal-event.lo \ +- e-cal-menu.lo e-cal-model-calendar.lo e-cal-model-tasks.lo \ +- e-cal-model.lo e-cal-popup.lo e-calendar-view.lo \ +- e-cal-list-view.lo e-cal-list-view-config.lo \ +- e-cal-model-memos.lo e-calendar-table.lo \ +- e-calendar-table-config.lo e-cell-date-edit-config.lo \ +- e-cell-date-edit-text.lo e-comp-editor-registry.lo \ +- e-date-edit-config.lo e-date-time-list.lo e-day-view-config.lo \ +- e-day-view-layout.lo e-day-view-main-item.lo \ +- e-day-view-time-item.lo e-day-view-top-item.lo e-day-view.lo \ +- e-itip-control.lo e-meeting-attendee.lo e-meeting-list-view.lo \ +- e-meeting-store.lo e-meeting-time-sel.lo \ +- e-meeting-time-sel-item.lo e-meeting-utils.lo e-memo-table.lo \ +- e-memo-table-config.lo e-memos.lo e-mini-calendar-config.lo \ +- e-select-names-editable.lo e-select-names-renderer.lo \ +- e-week-view-config.lo e-week-view-event-item.lo \ +- e-week-view-layout.lo e-week-view-main-item.lo \ +- e-week-view-titles-item.lo e-week-view.lo e-tasks.lo \ +- e-timezone-entry.lo gnome-cal.lo goto.lo \ +- itip-bonobo-control.lo itip-utils.lo main.lo \ +- memos-component.lo memos-control.lo migration.lo misc.lo \ +- print.lo tag-calendar.lo tasks-component.lo tasks-control.lo \ +- weekday-picker.lo +-libevolution_calendar_la_OBJECTS = \ +- $(am_libevolution_calendar_la_OBJECTS) +-libevolution_calendar_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_calendar_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_calendar_la_SOURCES) +-DIST_SOURCES = $(libevolution_calendar_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 +-etspecDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-ruleDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-serverDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(etspec_DATA) $(glade_DATA) $(rule_DATA) $(schema_DATA) \ +- $(server_DATA) +-ecalendarincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(ecalendarinclude_HEADERS) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -186,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -197,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -222,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -247,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -255,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -313,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -337,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -361,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -369,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -376,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -385,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -407,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -437,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -456,17 +384,16 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la ++ + IDLS = \ + $(top_srcdir)/composer/Evolution-Composer.idl \ + $(top_srcdir)/calendar/idl/evolution-calendar.idl + ++ + CALENDAR_IDL_GENERATED_H = \ + evolution-calendar.h + +@@ -477,6 +404,7 @@ + + CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H) + ++ + # Message composer IDL files + COMPOSER_IDL_GENERATED_H = \ + Evolution-Composer.h +@@ -487,19 +415,27 @@ + Evolution-Composer-stubs.c + + COMPOSER_IDL_GENERATED = $(COMPOSER_IDL_GENERATED_C) $(COMPOSER_IDL_GENERATED_H) ++ + IDL_GENERATED = $(CALENDAR_IDL_GENERATED) $(COMPOSER_IDL_GENERATED) + + # The marshallers + MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h ++ + SUBDIRS = alarm-notify dialogs ++ + component_LTLIBRARIES = libevolution-calendar.la ++ + ecalendarincludedir = $(privincludedir)/calendar/gui ++ + ecalendarinclude_HEADERS = \ + e-cal-config.h + ++ + search_files = tasktypes.xml memotypes.xml caltypes.xml ++ + ruledir = $(privdatadir) + rule_DATA = $(search_files) ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"calendar-gui\" \ + -I$(top_builddir)/shell \ +@@ -518,16 +454,19 @@ + $(LIBSOUP_CFLAGS) \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + glade_DATA = \ + e-itip-control.glade \ + goto-dialog.glade + ++ + etspec_DATA = \ + e-calendar-table.etspec \ + e-meeting-time-sel.etspec \ + e-cal-list-view.etspec \ + e-memo-table.etspec + ++ + libevolution_calendar_la_SOURCES = \ + $(IDL_GENERATED) \ + $(MARSHAL_GENERATED) \ +@@ -676,6 +615,7 @@ + weekday-picker.c \ + weekday-picker.h + ++ + libevolution_calendar_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/widgets/menus/libmenus.la \ +@@ -692,14 +632,18 @@ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++ + server_in_files = GNOME_Evolution_Calendar.server.in.in + server_DATA = $(server_in_files:.server.in.in=.server) + ++ + # GConf schemas + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = apps_evolution_calendar.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + EXTRA_DIST = \ + e-calendar-marshal.list \ + $(glade_DATA) \ +@@ -708,75 +652,224 @@ + $(server_in_files) \ + $(search_files) + ++ + BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++subdir = calendar/gui ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(component_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libevolution_calendar_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-mail.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/menus/libmenus.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/shell/libeshell.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/filter/libfilter.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la ++@OS_WIN32_FALSE@libevolution_calendar_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/menus/libmenus.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/shell/libeshell.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/filter/libfilter.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la ++am__objects_1 = evolution-calendar-common.lo evolution-calendar-skels.lo \ ++ evolution-calendar-stubs.lo ++am__objects_2 = ++am__objects_3 = $(am__objects_1) $(am__objects_2) ++am__objects_4 = Evolution-Composer-common.lo Evolution-Composer-skels.lo \ ++ Evolution-Composer-stubs.lo ++am__objects_5 = $(am__objects_4) $(am__objects_2) ++am__objects_6 = $(am__objects_3) $(am__objects_5) ++am__objects_7 = e-calendar-marshal.lo ++am_libevolution_calendar_la_OBJECTS = $(am__objects_6) $(am__objects_7) \ ++ cal-search-bar.lo calendar-config.lo calendar-commands.lo \ ++ calendar-component.lo calendar-view.lo calendar-view-factory.lo \ ++ comp-editor-factory.lo comp-util.lo control-factory.lo \ ++ e-alarm-list.lo e-cal-component-preview.lo \ ++ e-cal-component-memo-preview.lo e-cal-config.lo e-cal-event.lo \ ++ e-cal-menu.lo e-cal-model-calendar.lo e-cal-model-tasks.lo \ ++ e-cal-model.lo e-cal-popup.lo e-calendar-view.lo \ ++ e-cal-list-view.lo e-cal-list-view-config.lo \ ++ e-cal-model-memos.lo e-calendar-table.lo \ ++ e-calendar-table-config.lo e-cell-date-edit-config.lo \ ++ e-cell-date-edit-text.lo e-comp-editor-registry.lo \ ++ e-date-edit-config.lo e-date-time-list.lo e-day-view-config.lo \ ++ e-day-view-layout.lo e-day-view-main-item.lo \ ++ e-day-view-time-item.lo e-day-view-top-item.lo e-day-view.lo \ ++ e-itip-control.lo e-meeting-attendee.lo e-meeting-list-view.lo \ ++ e-meeting-store.lo e-meeting-time-sel.lo \ ++ e-meeting-time-sel-item.lo e-meeting-utils.lo e-memo-table.lo \ ++ e-memo-table-config.lo e-memos.lo e-mini-calendar-config.lo \ ++ e-select-names-editable.lo e-select-names-renderer.lo \ ++ e-week-view-config.lo e-week-view-event-item.lo \ ++ e-week-view-layout.lo e-week-view-main-item.lo \ ++ e-week-view-titles-item.lo e-week-view.lo e-tasks.lo \ ++ e-timezone-entry.lo gnome-cal.lo goto.lo itip-bonobo-control.lo \ ++ itip-utils.lo main.lo memos-component.lo memos-control.lo \ ++ migration.lo misc.lo print.lo tag-calendar.lo \ ++ tasks-component.lo tasks-control.lo weekday-picker.lo ++libevolution_calendar_la_OBJECTS = \ ++ $(am_libevolution_calendar_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-Composer-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cal-search-bar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-commands.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-view-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/comp-util.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/control-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-alarm-list.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-component-memo-preview.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-component-preview.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-event.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-list-view-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-list-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-menu.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model-memos.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model-tasks.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-popup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-table-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-table.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date-edit-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date-edit-text.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-comp-editor-registry.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-date-edit-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-date-time-list.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-layout.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-main-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-time-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-top-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-itip-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-attendee.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-list-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-store.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-time-sel-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-time-sel.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-memo-table-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-memo-table.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-memos.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-mini-calendar-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-select-names-editable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-select-names-renderer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tasks.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-timezone-entry.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-event-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-layout.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-main-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-titles-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gnome-cal.Plo ./$(DEPDIR)/goto.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/itip-bonobo-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/itip-utils.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/memos-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/memos-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/migration.Plo ./$(DEPDIR)/misc.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/print.Plo ./$(DEPDIR)/tag-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/tasks-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/tasks-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/weekday-picker.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_calendar_la_SOURCES) ++DATA = $(etspec_DATA) $(glade_DATA) $(rule_DATA) $(schema_DATA) \ ++ $(server_DATA) ++ ++HEADERS = $(ecalendarinclude_HEADERS) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(ecalendarinclude_HEADERS) $(srcdir)/Makefile.in \ ++ Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) ++SOURCES = $(libevolution_calendar_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/gui/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/gui/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++componentLTLIBRARIES_INSTALL = $(INSTALL) + install-componentLTLIBRARIES: $(component_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ + else :; fi; \ + done + + uninstall-componentLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ + done + + clean-componentLTLIBRARIES: + -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-calendar.la: $(libevolution_calendar_la_OBJECTS) $(libevolution_calendar_la_DEPENDENCIES) +- $(libevolution_calendar_la_LINK) -rpath $(componentdir) $(libevolution_calendar_la_OBJECTS) $(libevolution_calendar_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(componentdir) $(libevolution_calendar_la_LDFLAGS) $(libevolution_calendar_la_OBJECTS) $(libevolution_calendar_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -861,132 +954,154 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weekday-picker.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++etspecDATA_INSTALL = $(INSTALL_DATA) + install-etspecDATA: $(etspec_DATA) + @$(NORMAL_INSTALL) +- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(etspecdir) + @list='$(etspec_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ +- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ ++ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ + done + + uninstall-etspecDATA: + @$(NORMAL_UNINSTALL) + @list='$(etspec_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(etspecdir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++ruleDATA_INSTALL = $(INSTALL_DATA) + install-ruleDATA: $(rule_DATA) + @$(NORMAL_INSTALL) +- test -z "$(ruledir)" || $(MKDIR_P) "$(DESTDIR)$(ruledir)" ++ $(mkinstalldirs) $(DESTDIR)$(ruledir) + @list='$(rule_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(ruleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ruledir)/$$f'"; \ +- $(ruleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ruledir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f"; \ ++ $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f; \ + done + + uninstall-ruleDATA: + @$(NORMAL_UNINSTALL) + @list='$(rule_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(ruledir)/$$f'"; \ +- rm -f "$(DESTDIR)$(ruledir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(ruledir)/$$f"; \ ++ rm -f $(DESTDIR)$(ruledir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done ++serverDATA_INSTALL = $(INSTALL_DATA) + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" ++ $(mkinstalldirs) $(DESTDIR)$(serverdir) + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ +- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ ++ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ + done + + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ++ rm -f $(DESTDIR)$(serverdir)/$$f; \ + done ++ecalendarincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-ecalendarincludeHEADERS: $(ecalendarinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(ecalendarincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ecalendarincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(ecalendarincludedir) + @list='$(ecalendarinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(ecalendarincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ecalendarincludedir)/$$f'"; \ +- $(ecalendarincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ecalendarincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(ecalendarincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendarincludedir)/$$f"; \ ++ $(ecalendarincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendarincludedir)/$$f; \ + done + + uninstall-ecalendarincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(ecalendarinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(ecalendarincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(ecalendarincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(ecalendarincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(ecalendarincludedir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -996,13 +1111,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1014,20 +1123,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -1048,7 +1152,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1059,6 +1163,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -1067,22 +1179,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -1092,11 +1201,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -1119,23 +1227,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -1146,19 +1259,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1172,9 +1281,8 @@ + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(ruledir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(ecalendarincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(etspecdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(ruledir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) $(DESTDIR)$(ecalendarincludedir) ++ + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -1196,7 +1304,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -1212,14 +1320,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-recursive + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: +@@ -1229,20 +1335,12 @@ + install-gladeDATA install-ruleDATA install-schemaDATA \ + install-serverDATA + +-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 +@@ -1265,32 +1363,34 @@ + + uninstall-am: uninstall-componentLTLIBRARIES \ + uninstall-ecalendarincludeHEADERS uninstall-etspecDATA \ +- uninstall-gladeDATA uninstall-ruleDATA uninstall-schemaDATA \ +- uninstall-serverDATA ++ uninstall-gladeDATA uninstall-info-am uninstall-ruleDATA \ ++ uninstall-schemaDATA uninstall-serverDATA + +-.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-componentLTLIBRARIES \ +- clean-generic clean-libtool ctags ctags-recursive dist-hook \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-componentLTLIBRARIES clean-generic clean-libtool \ ++ clean-recursive ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ + install-componentLTLIBRARIES install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ +- install-ecalendarincludeHEADERS install-etspecDATA \ +- install-exec install-exec-am install-gladeDATA install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-ruleDATA install-schemaDATA install-serverDATA \ +- 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-componentLTLIBRARIES \ ++ install-data-local install-data-recursive \ ++ install-ecalendarincludeHEADERS install-etspecDATA install-exec \ ++ install-exec-am install-exec-recursive install-gladeDATA \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-ruleDATA install-schemaDATA \ ++ install-serverDATA install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am \ ++ uninstall-componentLTLIBRARIES \ + uninstall-ecalendarincludeHEADERS uninstall-etspecDATA \ +- uninstall-gladeDATA uninstall-ruleDATA uninstall-schemaDATA \ ++ uninstall-gladeDATA uninstall-info-am uninstall-info-recursive \ ++ uninstall-recursive uninstall-ruleDATA uninstall-schemaDATA \ + uninstall-serverDATA + + +diff -ruN evolution-2.12.2.orig/calendar/idl/Makefile.in evolution-2.12.2/calendar/idl/Makefile.in +--- evolution-2.12.2.orig/calendar/idl/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/idl/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/idl +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(idldir)" +-idlDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(idl_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,72 +384,60 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + idl_DATA = \ + evolution-calendar.idl + ++ + EXTRA_DIST = \ + $(idl_DATA) + ++subdir = calendar/idl ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(idl_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/idl/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/idl/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++idlDATA_INSTALL = $(INSTALL_DATA) + install-idlDATA: $(idl_DATA) + @$(NORMAL_INSTALL) +- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" ++ $(mkinstalldirs) $(DESTDIR)$(idldir) + @list='$(idl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ +- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ ++ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ + done + + uninstall-idlDATA: + @$(NORMAL_UNINSTALL) + @list='$(idl_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ ++ rm -f $(DESTDIR)$(idldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -434,23 +445,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +480,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(idldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(idldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -487,7 +502,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -498,34 +513,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-idlDATA + +-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,21 +549,17 @@ + + ps-am: + +-uninstall-am: uninstall-idlDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-idlDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-idlDATA install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-idlDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-idlDATA \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-idlDATA 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 -ruN evolution-2.12.2.orig/calendar/importers/Makefile.in evolution-2.12.2/calendar/importers/Makefile.in +--- evolution-2.12.2.orig/calendar/importers/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/importers/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar/importers +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_calendar_importers_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ +- $(am__DEPENDENCIES_1) +-am_libevolution_calendar_importers_la_OBJECTS = icalendar-importer.lo +-libevolution_calendar_importers_la_OBJECTS = \ +- $(am_libevolution_calendar_importers_la_OBJECTS) +-libevolution_calendar_importers_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_calendar_importers_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_calendar_importers_la_SOURCES) +-DIST_SOURCES = $(libevolution_calendar_importers_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + privsolib_LTLIBRARIES = libevolution-calendar-importers.la ++ + INCLUDES = \ + -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ + -DG_LOG_DOMAIN=\"Evolution-Importer\" \ +@@ -402,81 +397,90 @@ + -I$(top_builddir)/calendar \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + libevolution_calendar_importers_la_SOURCES = \ + evolution-calendar-importer.h \ + icalendar-importer.c + ++ + libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) ++ + libevolution_calendar_importers_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(EVOLUTION_CALENDAR_LIBS) + ++subdir = calendar/importers ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libevolution_calendar_importers_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la ++am_libevolution_calendar_importers_la_OBJECTS = icalendar-importer.lo ++libevolution_calendar_importers_la_OBJECTS = \ ++ $(am_libevolution_calendar_importers_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/icalendar-importer.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_calendar_importers_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_calendar_importers_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/importers/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/importers/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-calendar-importers.la: $(libevolution_calendar_importers_la_OBJECTS) $(libevolution_calendar_importers_la_DEPENDENCIES) +- $(libevolution_calendar_importers_la_LINK) -rpath $(privsolibdir) $(libevolution_calendar_importers_la_OBJECTS) $(libevolution_calendar_importers_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_calendar_importers_la_LDFLAGS) $(libevolution_calendar_importers_la_OBJECTS) $(libevolution_calendar_importers_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -484,25 +488,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icalendar-importer.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -510,6 +526,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -518,7 +546,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -530,11 +557,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -557,23 +583,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -587,10 +618,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -610,7 +640,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -624,34 +654,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -672,23 +692,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/calendar/Makefile.in evolution-2.12.2/calendar/Makefile.in +--- evolution-2.12.2.orig/calendar/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/calendar/Makefile.in 2007-12-05 15:54:52.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,47 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = calendar +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS \ +- ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(errordir)" +-errorDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = idl common importers gui conduits +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -104,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -115,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -140,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -165,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -173,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -231,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -255,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -279,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -287,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -294,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -303,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -325,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -355,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -374,80 +384,79 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ +-@ENABLE_PILOT_CONDUITS_FALSE@CONDUIT_DIR = + @ENABLE_PILOT_CONDUITS_TRUE@CONDUIT_DIR = conduits ++@ENABLE_PILOT_CONDUITS_FALSE@CONDUIT_DIR = ++ + SUBDIRS = idl common importers gui $(CONDUIT_DIR) ++ + error_DATA = calendar.error + errordir = $(privdatadir)/errors ++ + EXTRA_DIST = \ + calendar.error.xml \ + ChangeLog.pre-1-4 \ + $(error_DATA) \ + zones.h + ++ + BUILT_SOURCES = $(error_DATA) ++ + CLEANFILES = $(BUILT_SOURCES) ++subdir = calendar ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(error_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in AUTHORS ChangeLog Makefile.am ++DIST_SUBDIRS = idl common importers gui conduits + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu calendar/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -457,13 +466,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -475,20 +478,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -509,7 +507,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -520,6 +518,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -528,22 +534,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -553,11 +556,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -580,23 +582,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -609,17 +616,13 @@ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -633,9 +636,8 @@ + all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(errordir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(errordir) ++ + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -657,7 +659,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -669,34 +671,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-errorDATA + +-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 +@@ -715,24 +708,26 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA ++uninstall-am: uninstall-errorDATA 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 dist-hook distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-errorDATA \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-errorDATA ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-errorDATA install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-recursive \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am uninstall-errorDATA \ ++ uninstall-info-am uninstall-info-recursive uninstall-recursive + + @EVO_PLUGIN_RULE@ + +diff -ruN evolution-2.12.2.orig/composer/Makefile.in evolution-2.12.2/composer/Makefile.in +--- evolution-2.12.2.orig/composer/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/composer/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,57 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = composer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-libcomposer_la_LIBADD = +-am__objects_1 = Composer-common.lo Composer-skels.lo Composer-stubs.lo +-am__objects_2 = Editor-common.lo Editor-skels.lo Editor-stubs.lo +-am_libcomposer_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ +- e-msg-composer-hdrs.lo e-msg-composer-select-file.lo \ +- e-msg-composer.lo evolution-composer.lo listener.lo +-libcomposer_la_OBJECTS = $(am_libcomposer_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libcomposer_la_SOURCES) +-DIST_SOURCES = $(libcomposer_la_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(errordir)" "$(DESTDIR)$(idldir)" +-errorDATA_INSTALL = $(INSTALL_DATA) +-idlDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(idl_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -115,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -126,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -151,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -176,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -184,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -242,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -266,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -290,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -298,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -305,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -314,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -336,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -366,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -385,32 +384,36 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + IDLS = \ + Evolution-Composer.idl \ + Composer.idl + ++ + IDL_GENERATED = \ + Composer.h \ + Composer-common.c \ + Composer-skels.c \ + Composer-stubs.c + ++ + HTML_EDITOR_GENERATED = \ + Editor.h \ + Editor-common.c \ + Editor-skels.c \ + Editor-stubs.c + ++ + error_DATA = mail-composer.error + errordir = $(privdatadir)/errors ++ + idl_DATA = $(IDLS) ++ + noinst_LTLIBRARIES = libcomposer.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +@@ -429,6 +432,7 @@ + -DG_LOG_DOMAIN=\"composer\" \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + libcomposer_la_SOURCES = \ + $(IDL_GENERATED) \ + $(HTML_EDITOR_GENERATED) \ +@@ -443,61 +447,82 @@ + listener.c \ + listener.h + ++ + EXTRA_DIST = \ + mail-composer.error.xml \ + $(IDLS) \ + ChangeLog.pre-1-4 + ++ + BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = composer ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libcomposer_la_LDFLAGS = ++libcomposer_la_LIBADD = ++am__objects_1 = Composer-common.lo Composer-skels.lo Composer-stubs.lo ++am__objects_2 = Editor-common.lo Editor-skels.lo Editor-stubs.lo ++am_libcomposer_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ ++ e-msg-composer-hdrs.lo e-msg-composer-select-file.lo \ ++ e-msg-composer.lo evolution-composer.lo listener.lo ++libcomposer_la_OBJECTS = $(am_libcomposer_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Composer-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Composer-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Composer-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Editor-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Editor-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Editor-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-msg-composer-hdrs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-msg-composer-select-file.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-msg-composer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-composer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/listener.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libcomposer_la_SOURCES) ++DATA = $(error_DATA) $(idl_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(libcomposer_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu composer/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu composer/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libcomposer.la: $(libcomposer_la_OBJECTS) $(libcomposer_la_DEPENDENCIES) +- $(LINK) $(libcomposer_la_OBJECTS) $(libcomposer_la_LIBADD) $(LIBS) ++ $(LINK) $(libcomposer_la_LDFLAGS) $(libcomposer_la_OBJECTS) $(libcomposer_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -515,66 +540,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listener.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++idlDATA_INSTALL = $(INSTALL_DATA) + install-idlDATA: $(idl_DATA) + @$(NORMAL_INSTALL) +- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" ++ $(mkinstalldirs) $(DESTDIR)$(idldir) + @list='$(idl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ +- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ ++ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ + done + + uninstall-idlDATA: + @$(NORMAL_UNINSTALL) + @list='$(idl_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ ++ rm -f $(DESTDIR)$(idldir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -583,7 +634,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -595,11 +645,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -622,23 +671,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -656,10 +710,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(errordir)" "$(DESTDIR)$(idldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(errordir) $(DESTDIR)$(idldir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -681,7 +734,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -696,34 +749,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-errorDATA install-idlDATA + +-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 +@@ -744,24 +787,20 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-idlDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-errorDATA uninstall-idlDATA uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \ +- 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-errorDATA \ +- install-exec install-exec-am install-html install-html-am \ +- install-idlDATA install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-errorDATA uninstall-idlDATA ++ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-idlDATA 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-errorDATA \ ++ uninstall-idlDATA uninstall-info-am + + + $(IDL_GENERATED): $(IDLS) +diff -ruN evolution-2.12.2.orig/configure evolution-2.12.2/configure +--- evolution-2.12.2.orig/configure 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/configure 2007-12-05 15:54:48.000000000 +0100 +@@ -819,7 +819,6 @@ + INSTALL_PROGRAM + INSTALL_SCRIPT + INSTALL_DATA +-am__isrc + CYGPATH_W + PACKAGE + VERSION +@@ -828,16 +827,13 @@ + AUTOMAKE + AUTOHEADER + MAKEINFO ++AMTAR + install_sh + STRIP + INSTALL_STRIP_PROGRAM +-mkdir_p + AWK + SET_MAKE + am__leading_dot +-AMTAR +-am__tar +-am__untar + build + build_cpu + build_vendor +@@ -901,9 +897,6 @@ + INTLTOOL_THEME_RULE + INTLTOOL_SERVICE_RULE + INTLTOOL_POLICY_RULE +-XGETTEXT +-MSGMERGE +-MSGFMT + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE +@@ -911,8 +904,10 @@ + ALL_LINGUAS + DATADIRNAME + USE_NLS ++MSGFMT + MSGFMT_OPTS + GMSGFMT ++XGETTEXT + CATALOGS + CATOBJEXT + GMOFILES +@@ -924,6 +919,7 @@ + POSUB + MKINSTALLDIRS + GETTEXT_PACKAGE ++SED + ECHO + AR + RANLIB +@@ -1011,7 +1007,6 @@ + GLIB_GENMARSHAL + GOBJECT_QUERY + GLIB_MKENUMS +-WARN_CFLAGS + X_CFLAGS + X_LIBS + XMKMF +@@ -1798,10 +1793,10 @@ + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-scrollkeeper do not make updates to the scrollkeeper database +- --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer +- --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer ++ --disable-dependency-tracking Speeds up one-time builds ++ --enable-dependency-tracking Do not reject slow dependency extractors + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] +@@ -1824,9 +1819,6 @@ + (this requires --enable-nss) + --enable-exchange Build Exchange plugins + --disable-glibtest do not try to compile and run a test GLIB program +- --enable-compile-warnings=[no/minimum/yes/maximum/error] +- Turn on compiler warnings +- --enable-iso-c Try to warn if code is not ISO C + --disable-orbittest Do not try to compile and run a test ORBIT program + --enable-file-chooser Enable the usage of the GtkFileChooser in place of + the GtkFileSelection dialog +@@ -2674,7 +2666,9 @@ + enable_scrollkeeper=yes + fi + +- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then ++ ++ ++if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then + ENABLE_SK_TRUE= + ENABLE_SK_FALSE='#' + else +@@ -2683,7 +2677,9 @@ + fi + + +- if test "$gdu_cv_have_gdu" = "yes"; then ++ ++ ++if test "$gdu_cv_have_gdu" = "yes"; then + HAVE_GNOME_DOC_UTILS_TRUE= + HAVE_GNOME_DOC_UTILS_FALSE='#' + else +@@ -2697,8 +2693,7 @@ + # The extra brackets are to foil regex-based scans. + + +-am__api_version='1.10' +- ++am__api_version="1.7" + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2868,6 +2863,7 @@ + program_transform_name=`echo $program_transform_name | sed -f conftest.sed` + rm -f conftest.sed + ++ + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +@@ -2881,54 +2877,6 @@ + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +-if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue +- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +- 'mkdir (GNU coreutils) '* | \ +- 'mkdir (coreutils) '* | \ +- 'mkdir (fileutils) '4.1*) +- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext +- break 3;; +- esac +- done +- done +-done +-IFS=$as_save_IFS +- +-fi +- +- if test "${ac_cv_path_mkdir+set}" = set; then +- MKDIR_P="$ac_cv_path_mkdir -p" +- else +- # As a last resort, use the slow shell script. Don't cache a +- # value for MKDIR_P within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version +- MKDIR_P="$ac_install_sh -d" +- fi +-fi +-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +-echo "${ECHO_T}$MKDIR_P" >&6; } +- +-mkdir_p="$MKDIR_P" +-case $mkdir_p in +- [\\/$]* | ?:[\\/]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +- + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -3010,16 +2958,12 @@ + fi + rmdir .tst 2>/dev/null + +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- am__isrc=' -I$(srcdir)' +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++ # test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } +- fi + fi + + # test whether we have cygpath +@@ -3062,7 +3006,10 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -3166,98 +3113,10 @@ + fi + + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +-# Always define AMTAR for backward compatibility. +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +- +-{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 +-echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; } +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar plaintar pax cpio none' +-_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- { echo "$as_me:$LINENO: $_am_tar --version" >&5 +- ($_am_tar --version) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && break +- done +- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x ustar -w "$$tardir"' +- am__tar_='pax -L -x ustar -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H ustar -L' +- am__tar_='find "$tardir" -print | cpio -o -H ustar -L' +- am__untar='cpio -i -H ustar -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_ustar}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 +- (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- rm -rf conftest.dir +- if test -s conftest.tar; then +- { echo "$as_me:$LINENO: $am__untar &5 +- ($am__untar &5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir +- +-if test "${am_cv_prog_tar_ustar+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- am_cv_prog_tar_ustar=$_am_tool +-fi +- +-{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5 +-echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; } +- +- + + + +@@ -3366,7 +3225,9 @@ + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } +- if test $USE_MAINTAINER_MODE = yes; then ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -3454,7 +3315,9 @@ + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- if test "x$enable_dependency_tracking" != xno; then ++ ++ ++if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -3463,6 +3326,7 @@ + fi + + ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -4423,9 +4287,7 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -4449,19 +4311,13 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -4479,7 +4335,9 @@ + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- if ++ ++ ++if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -4491,14 +4349,12 @@ + + + +- +- { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 +-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; } +-if test "${ac_cv_lib_cposix_strerror+set}" = set; then ++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } ++if test "${ac_cv_search_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcposix $LIBS" ++ ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4521,7 +4377,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -4539,25 +4402,35 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_cposix_strerror=yes ++ ac_cv_search_strerror=$ac_res + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_cposix_strerror=no ++ + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_strerror+set}" = set; then ++ : ++else ++ ac_cv_search_strerror=no + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 +-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; } +-if test $ac_cv_lib_cposix_strerror = yes; then +- LIBS="$LIBS -lcposix" ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +- ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5276,9 +5149,7 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -5302,19 +5173,13 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -5332,7 +5197,9 @@ + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- if ++ ++ ++if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -6489,7 +6356,9 @@ + else + HAVE_JW="yes" + fi +- if test x$HAVE_JW = xyes; then ++ ++ ++if test x$HAVE_JW = xyes; then + HAVE_JW_TRUE= + HAVE_JW_FALSE='#' + else +@@ -6566,141 +6435,6 @@ + + + +-# Check the gettext tools to make sure they are GNU +-# Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $XGETTEXT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-XGETTEXT=$ac_cv_path_XGETTEXT +-if test -n "$XGETTEXT"; then +- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-echo "${ECHO_T}$XGETTEXT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-# Extract the first word of "msgmerge", so it can be a program name with args. +-set dummy msgmerge; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_MSGMERGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $MSGMERGE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-MSGMERGE=$ac_cv_path_MSGMERGE +-if test -n "$MSGMERGE"; then +- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +-echo "${ECHO_T}$MSGMERGE" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-# Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $MSGFMT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-MSGFMT=$ac_cv_path_MSGFMT +-if test -n "$MSGFMT"; then +- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-echo "${ECHO_T}$MSGFMT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } +-fi +-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then +- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } +-fi +- + # Use the tools built into the package, not the ones that are installed. + INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' + +@@ -8622,12 +8356,13 @@ + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done + done ++IFS=$as_save_IFS + lt_ac_max=0 + lt_ac_count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris +@@ -8662,6 +8397,7 @@ + fi + + SED=$lt_cv_path_SED ++ + { echo "$as_me:$LINENO: result: $SED" >&5 + echo "${ECHO_T}$SED" >&6; } + +@@ -8850,8 +8586,8 @@ + echo "${ECHO_T}$lt_cv_path_NM" >&6; } + NM="$lt_cv_path_NM" + +-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } + if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8892,16 +8628,22 @@ + + mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by +- # func_win32_libid shell function, so use a weaker test based on 'objdump'. +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi + ;; + + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -8939,7 +8681,7 @@ + esac + ;; + +-interix3*) ++interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; +@@ -8955,11 +8697,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -8989,6 +8731,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -9075,7 +8821,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 9078 "configure"' > conftest.$ac_ext ++ echo '#line 8824 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9110,7 +8856,8 @@ + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -9121,6 +8868,9 @@ + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +@@ -9137,6 +8887,9 @@ + ;; + *64-bit*) + case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +@@ -10094,9 +9847,7 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -10120,19 +9871,13 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi +@@ -10150,7 +9895,9 @@ + echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- if ++ ++ ++if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -10745,24 +10492,27 @@ + fi + ;; + *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi + ;; + esac + +@@ -10779,6 +10529,7 @@ + + + ++ + # Check for command to grab the raw symbol name followed by C symbol from nm. + { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 + echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } +@@ -10816,7 +10567,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -11367,7 +11118,7 @@ + test -z "$ac_objext" && ac_objext=o + + # Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' + old_postinstall_cmds='chmod 644 $oldlib' + old_postuninstall_cmds= + +@@ -11567,10 +11318,10 @@ + objext=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' ++lt_simple_link_test_code='int main(){return(0);}' + + + # If no C compiler was specified, use CC. +@@ -11585,13 +11336,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* +@@ -11611,7 +11362,7 @@ + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -11622,11 +11373,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11625: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11376: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11629: \$? = $ac_status" >&5 ++ echo "$as_me:11380: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11677,13 +11428,15 @@ + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + +@@ -11693,7 +11446,7 @@ + lt_prog_compiler_pic='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -11751,7 +11504,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' +@@ -11784,7 +11537,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -11803,6 +11556,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -11812,6 +11581,10 @@ + lt_prog_compiler_static='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +@@ -11879,7 +11652,7 @@ + else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -11890,11 +11663,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11893: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11666: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11897: \$? = $ac_status" >&5 ++ echo "$as_me:11670: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11943,7 +11716,7 @@ + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -11983,7 +11756,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -11994,11 +11767,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11997: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11770: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12001: \$? = $ac_status" >&5 ++ echo "$as_me:11774: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12190,7 +11963,7 @@ + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -12208,7 +11981,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +@@ -12223,7 +11996,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -12241,20 +12014,30 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -12406,7 +12189,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct=yes ++ : + else + # We have old collect2 + hardcode_direct=unsupported +@@ -12480,11 +12263,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -12539,11 +12329,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -12597,7 +12394,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; +@@ -12639,10 +12436,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -12682,7 +12479,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -12784,7 +12581,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -12804,24 +12601,28 @@ + ;; + + openbsd*) +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- export_dynamic_flag_spec='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' +- ;; +- *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs=no + fi + ;; + +@@ -12880,17 +12681,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs=yes + ;; +@@ -12947,7 +12747,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no +@@ -13024,7 +12824,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -13082,17 +12882,55 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ + if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[lt_foo]++; } ++ if (lt_freq[lt_foo] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi +@@ -13252,12 +13090,8 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -13274,18 +13108,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -13323,7 +13145,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -13386,7 +13208,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13441,7 +13263,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13455,31 +13277,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 13462 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -13491,7 +13292,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13500,7 +13301,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -13584,6 +13385,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -13737,6 +13542,7 @@ + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" ++ old_striplib="$STRIP -S" + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else +@@ -14323,7 +14129,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* +@@ -15442,7 +15249,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_CXX=yes ++ : + else + # We have old collect2 + hardcode_direct_CXX=unsupported +@@ -15516,11 +15323,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -15576,11 +15390,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -15699,10 +15520,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -15736,7 +15557,7 @@ + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -15785,9 +15606,7 @@ + hardcode_libdir_separator_CXX=: + + case $host_cpu in +- hppa*64*|ia64*) +- hardcode_libdir_flag_spec_ld_CXX='+b $libdir' +- ;; ++ hppa*64*|ia64*) ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; +@@ -15855,7 +15674,7 @@ + ;; + esac + ;; +- interix3*) ++ interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +@@ -15895,7 +15714,7 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -15975,6 +15794,29 @@ + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; + esac + ;; + lynxos*) +@@ -15997,7 +15839,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -16013,16 +15855,20 @@ + ld_shlibs_CXX=no + ;; + openbsd*) +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- export_dynamic_flag_spec_CXX='${wl}-E' +- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ else ++ ld_shlibs_CXX=no + fi +- output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in +@@ -16184,15 +16030,10 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes +@@ -16239,6 +16080,12 @@ + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac + fi + ;; + esac +@@ -16430,7 +16277,7 @@ + + # PORTME: override above test on systems where it is broken + case $host_os in +-interix3*) ++interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= +@@ -16438,13 +16285,46 @@ + postdeps_CXX= + ;; + ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ # ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ + solaris*) + case $cc_basename in + CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. +- postdeps_CXX='-lCstd -lCrun' ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi + ;; + esac + ;; +@@ -16481,12 +16361,14 @@ + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) +@@ -16498,7 +16380,7 @@ + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -16564,7 +16446,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -16607,7 +16489,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -16634,6 +16516,14 @@ + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -16650,7 +16540,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -16748,7 +16638,7 @@ + else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -16759,11 +16649,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16762: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16652: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16766: \$? = $ac_status" >&5 ++ echo "$as_me:16656: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16812,7 +16702,7 @@ + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -16852,7 +16742,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -16863,11 +16753,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16866: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16756: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16870: \$? = $ac_status" >&5 ++ echo "$as_me:16760: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16933,7 +16823,10 @@ + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw*) +- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +@@ -16964,7 +16857,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -17022,20 +16915,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -17192,12 +17072,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -17214,18 +17089,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -17263,7 +17126,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -17326,7 +17189,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17381,7 +17244,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17395,31 +17258,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 17402 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -17431,7 +17273,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17440,7 +17282,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -17524,6 +17366,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -17718,6 +17564,7 @@ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ ++ fix_srcfile_path_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + +@@ -18038,7 +17885,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_CXX" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_CXX +@@ -18129,10 +17976,17 @@ + objext_F77=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + + # Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" ++lt_simple_link_test_code="\ ++ program t ++ end ++" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + +@@ -18148,13 +18002,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* +@@ -18241,13 +18095,15 @@ + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + +@@ -18257,7 +18113,7 @@ + lt_prog_compiler_pic_F77='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -18315,7 +18171,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_F77='-DDLL_EXPORT' +@@ -18348,7 +18204,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -18367,6 +18223,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -18376,6 +18248,10 @@ + lt_prog_compiler_static_F77='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' +@@ -18443,7 +18319,7 @@ + else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -18454,11 +18330,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18457: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18333: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18461: \$? = $ac_status" >&5 ++ echo "$as_me:18337: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18507,7 +18383,7 @@ + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -18547,7 +18423,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -18558,11 +18434,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18561: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18437: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18565: \$? = $ac_status" >&5 ++ echo "$as_me:18441: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18754,7 +18630,7 @@ + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=no + enable_shared_with_static_runtimes_F77=yes +- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -18772,7 +18648,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +@@ -18787,7 +18663,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -18805,20 +18681,30 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -18970,7 +18856,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_F77=yes ++ : + else + # We have old collect2 + hardcode_direct_F77=unsupported +@@ -19034,11 +18920,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -19083,11 +18976,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -19141,7 +19041,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_F77='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes + ;; +@@ -19183,10 +19083,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -19226,7 +19126,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -19328,7 +19228,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -19348,24 +19248,28 @@ + ;; + + openbsd*) +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_F77='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_F77='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ ;; ++ *) ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- ;; +- *) +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs_F77=no + fi + ;; + +@@ -19424,17 +19328,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs_F77=yes + ;; +@@ -19491,7 +19394,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no +@@ -19568,7 +19471,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -19626,20 +19529,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -19796,12 +19686,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -19818,18 +19703,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -19867,7 +19740,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -19930,7 +19803,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19985,7 +19858,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19999,31 +19872,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 20006 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -20035,7 +19887,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -20044,7 +19896,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -20128,6 +19980,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -20322,6 +20178,7 @@ + module_cmds_F77 \ + module_expsym_cmds_F77 \ + lt_cv_prog_compiler_c_o_F77 \ ++ fix_srcfile_path_F77 \ + exclude_expsyms_F77 \ + include_expsyms_F77; do + +@@ -20642,7 +20499,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_F77" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_F77 +@@ -20700,10 +20557,10 @@ + objext_GCJ=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" ++lt_simple_compile_test_code="class foo {}" + + # Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' ++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + +@@ -20719,13 +20576,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* +@@ -20766,7 +20623,7 @@ + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -20777,11 +20634,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:20780: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20637: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:20784: \$? = $ac_status" >&5 ++ echo "$as_me:20641: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -20832,13 +20689,15 @@ + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + +@@ -20848,7 +20707,7 @@ + lt_prog_compiler_pic_GCJ='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -20906,7 +20765,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' +@@ -20939,7 +20798,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -20958,6 +20817,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ lt_prog_compiler_wl_GCJ='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -20967,6 +20842,10 @@ + lt_prog_compiler_static_GCJ='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static_GCJ='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' +@@ -21034,7 +20913,7 @@ + else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -21045,11 +20924,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:21048: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20927: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:21052: \$? = $ac_status" >&5 ++ echo "$as_me:20931: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -21098,7 +20977,7 @@ + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -21138,7 +21017,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -21149,11 +21028,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:21152: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:21031: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:21156: \$? = $ac_status" >&5 ++ echo "$as_me:21035: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -21345,7 +21224,7 @@ + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=no + enable_shared_with_static_runtimes_GCJ=yes +- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -21363,7 +21242,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +@@ -21378,7 +21257,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -21396,20 +21275,30 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -21561,7 +21450,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_GCJ=yes ++ : + else + # We have old collect2 + hardcode_direct_GCJ=unsupported +@@ -21635,11 +21524,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -21694,11 +21590,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -21752,7 +21655,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_GCJ='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_GCJ=yes + ;; +@@ -21794,10 +21697,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -21837,7 +21740,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -21939,7 +21842,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -21959,24 +21862,28 @@ + ;; + + openbsd*) +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_GCJ='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ ;; ++ *) ++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- ;; +- *) +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs_GCJ=no + fi + ;; + +@@ -22035,17 +21942,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs_GCJ=yes + ;; +@@ -22102,7 +22008,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no +@@ -22179,7 +22085,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -22237,20 +22143,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -22407,12 +22300,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -22429,18 +22317,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -22478,7 +22354,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -22541,7 +22417,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -22596,7 +22472,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -22610,31 +22486,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 22617 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -22646,7 +22501,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -22655,7 +22510,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -22739,6 +22594,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -22933,6 +22792,7 @@ + module_cmds_GCJ \ + module_expsym_cmds_GCJ \ + lt_cv_prog_compiler_c_o_GCJ \ ++ fix_srcfile_path_GCJ \ + exclude_expsyms_GCJ \ + include_expsyms_GCJ; do + +@@ -23253,7 +23113,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_GCJ" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_GCJ +@@ -23310,7 +23170,7 @@ + objext_RC=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + + # Code to be used in simple link tests + lt_simple_link_test_code="$lt_simple_compile_test_code" +@@ -23329,13 +23189,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* +@@ -23413,6 +23273,7 @@ + module_cmds_RC \ + module_expsym_cmds_RC \ + lt_cv_prog_compiler_c_o_RC \ ++ fix_srcfile_path_RC \ + exclude_expsyms_RC \ + include_expsyms_RC; do + +@@ -23733,7 +23594,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_RC" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_RC +@@ -23979,7 +23840,9 @@ + esac + { echo "$as_me:$LINENO: result: $os_win32" >&5 + echo "${ECHO_T}$os_win32" >&6; } +- if test $os_win32 = yes; then ++ ++ ++if test $os_win32 = yes; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' + else +@@ -24152,7 +24015,7 @@ + and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -24162,7 +24025,7 @@ + and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -24306,7 +24169,7 @@ + and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -24316,7 +24179,7 @@ + and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -25091,7 +24954,9 @@ + PURIFYOPTIONS=$with_purify_options + fi + +- if test x$enable_purify = xyes -a x$PURIFY != ximpure; then ++ ++ ++if test x$enable_purify = xyes -a x$PURIFY != ximpure; then + ENABLE_PURIFY_TRUE= + ENABLE_PURIFY_FALSE='#' + else +@@ -25110,7 +24975,9 @@ + fi + + +- if test x$enable_test_comp = xyes; then ++ ++ ++if test x$enable_test_comp = xyes; then + ENABLE_TEST_COMPONENT_TRUE= + ENABLE_TEST_COMPONENT_FALSE='#' + else +@@ -26539,7 +26406,7 @@ + and GIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -26549,7 +26416,7 @@ + and GIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -26651,7 +26518,7 @@ + and A11Y_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -26661,7 +26528,7 @@ + and A11Y_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -27175,7 +27042,9 @@ + + + fi +- if test $with_openldap != no; then ++ ++ ++if test $with_openldap != no; then + ENABLE_LDAP_TRUE= + ENABLE_LDAP_FALSE='#' + else +@@ -27311,7 +27180,9 @@ + #define HAVE_LDAP 1 + _ACEOF + +- if true; then ++ ++ ++if true; then + ENABLE_LDAP_TRUE= + ENABLE_LDAP_FALSE='#' + else +@@ -27781,7 +27652,9 @@ + + + fi +- if test $with_sunldap != no; then ++ ++ ++if test $with_sunldap != no; then + ENABLE_LDAP_TRUE= + ENABLE_LDAP_FALSE='#' + else +@@ -27807,7 +27680,9 @@ + else + with_sunldap=no + fi +- if test x$with_sunldap != xno; then ++ ++ ++if test x$with_sunldap != xno; then + SUNLDAP_TRUE= + SUNLDAP_FALSE='#' + else +@@ -27833,7 +27708,9 @@ + else + msg_nntp=no + fi +- if test x$enable_nntp = xyes; then ++ ++ ++if test x$enable_nntp = xyes; then + ENABLE_NNTP_TRUE= + ENABLE_NNTP_FALSE='#' + else +@@ -27859,7 +27736,9 @@ + else + msg_imapp=no + fi +- if test x$enable_imapp = xyes; then ++ ++ ++if test x$enable_imapp = xyes; then + ENABLE_IMAPP_TRUE= + ENABLE_IMAPP_FALSE='#' + else +@@ -27885,7 +27764,9 @@ + else + msg_imap4=no + fi +- if test x$enable_imap4 = xyes; then ++ ++ ++if test x$enable_imap4 = xyes; then + ENABLE_IMAP4_TRUE= + ENABLE_IMAP4_FALSE='#' + else +@@ -27911,7 +27792,9 @@ + else + msg_cairo=no + fi +- if test x$enable_cairo_calendar = xyes; then ++ ++ ++if test x$enable_cairo_calendar = xyes; then + ENABLE_CAIRO_TRUE= + ENABLE_CAIRO_FALSE='#' + else +@@ -28556,7 +28439,7 @@ + and GTKHTML_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -28566,7 +28449,7 @@ + and GTKHTML_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -28689,7 +28572,7 @@ + and GNOME_PILOT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -28699,7 +28582,7 @@ + and GNOME_PILOT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -28794,7 +28677,9 @@ + { (exit 1); exit 1; }; } + fi + fi +- if test x$enable_pilot_conduits = xyes; then ++ ++ ++if test x$enable_pilot_conduits = xyes; then + ENABLE_PILOT_CONDUITS_TRUE= + ENABLE_PILOT_CONDUITS_FALSE='#' + else +@@ -31114,7 +30999,9 @@ + fi + fi + +- if test "x$msg_smime" != "xno"; then ++ ++ ++if test "x$msg_smime" != "xno"; then + ENABLE_SMIME_TRUE= + ENABLE_SMIME_FALSE='#' + else +@@ -31141,7 +31028,9 @@ + else + msg_exchange=no + fi +- if test x$enable_exchange = xyes; then ++ ++ ++if test x$enable_exchange = xyes; then + ENABLE_EXCHANGE_TRUE= + ENABLE_EXCHANGE_FALSE='#' + else +@@ -31171,7 +31060,9 @@ + echo "${ECHO_T}$DTAPPINTEGRATE" >&6; } + + +- if test x$DTAPPINTEGRATE != xno; then ++ ++ ++if test x$DTAPPINTEGRATE != xno; then + HAVE_DTAPPINTEGRATE_TRUE= + HAVE_DTAPPINTEGRATE_FALSE='#' + else +@@ -31698,138 +31589,7 @@ + + + +- +- +- # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then +- enableval=$enable_compile_warnings; +-else +- enable_compile_warnings="yes" +-fi +- +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- has_option=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- has_option=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- { echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6; } +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6; } +- +- # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then +- enableval=$enable_iso_c; +-else +- enable_iso_c=no +-fi +- +- +- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6; } +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- ++GNOME_COMPILE_WARNINGS(yes) + CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) +@@ -32139,6 +31899,8 @@ + # Put the nasty error message in config.log where it belongs + echo "$X_PKG_ERRORS" >&5 + ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + # pkg-config modules not found (only present since X11R7 aka Xorg); use + # old-style detection +@@ -35321,7 +35083,9 @@ + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 + +- HAVE_HAL="no" ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ HAVE_HAL="no" + elif test $pkg_failed = untried; then + HAVE_HAL="no" + else +@@ -35493,7 +35257,7 @@ + and CAMEL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -35503,7 +35267,7 @@ + and CAMEL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -35611,7 +35375,7 @@ + and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -35621,7 +35385,7 @@ + and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -35730,7 +35494,7 @@ + and MOZILLA_NSS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -35740,7 +35504,7 @@ + and MOZILLA_NSS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -35852,7 +35616,7 @@ + and CERT_UI_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -35862,7 +35626,7 @@ + and CERT_UI_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -35970,7 +35734,7 @@ + and E_NAME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -35980,7 +35744,7 @@ + and E_NAME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -36097,7 +35861,7 @@ + and E_UTIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -36107,7 +35871,7 @@ + and E_UTIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -36215,7 +35979,7 @@ + and TZDIALOG_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -36225,7 +35989,7 @@ + and TZDIALOG_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -36333,7 +36097,7 @@ + and E_WIDGETS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -36343,7 +36107,7 @@ + and E_WIDGETS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -36451,7 +36215,7 @@ + and IMPORTERS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -36461,7 +36225,7 @@ + and IMPORTERS_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -36569,7 +36333,7 @@ + and LIBFILTER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -36579,7 +36343,7 @@ + and LIBFILTER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -36657,7 +36421,9 @@ + # Put the nasty error message in config.log where it belongs + echo "$NM_PKG_ERRORS" >&5 + +- NM_SUPPORT_GLIB="no" ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ NM_SUPPORT_GLIB="no" + elif test $pkg_failed = untried; then + NM_SUPPORT_GLIB="no" + else +@@ -36734,7 +36500,9 @@ + # Put the nasty error message in config.log where it belongs + echo "$NM_PKG_ERRORS" >&5 + +- NM_SUPPORT="no" ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ NM_SUPPORT="no" + elif test $pkg_failed = untried; then + NM_SUPPORT="no" + else +@@ -36891,7 +36659,9 @@ + fi + fi + +- if test x$NM_SUPPORT_GLIB = xyes; then ++ ++ ++if test x$NM_SUPPORT_GLIB = xyes; then + NM_SUPPORT_GLIB_TRUE= + NM_SUPPORT_GLIB_FALSE='#' + else +@@ -36899,7 +36669,9 @@ + NM_SUPPORT_GLIB_FALSE= + fi + +- if test x$NM_SUPPORT = xyes; then ++ ++ ++if test x$NM_SUPPORT = xyes; then + NM_SUPPORT_TRUE= + NM_SUPPORT_FALSE='#' + else +@@ -37001,7 +36773,7 @@ + and SHELL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37011,7 +36783,7 @@ + and SHELL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -37123,7 +36895,7 @@ + and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37133,7 +36905,7 @@ + and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -37242,7 +37014,7 @@ + and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37252,7 +37024,7 @@ + and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -37330,7 +37102,9 @@ + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + +- HAVE_LIBNOTIFY="no" ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ HAVE_LIBNOTIFY="no" + elif test $pkg_failed = untried; then + HAVE_LIBNOTIFY="no" + else +@@ -37412,7 +37186,9 @@ + # Put the nasty error message in config.log where it belongs + echo "$SOUPTEMP_PKG_ERRORS" >&5 + +- have_libsoup_24="no" ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ have_libsoup_24="no" + elif test $pkg_failed = untried; then + have_libsoup_24="no" + else +@@ -37522,7 +37298,7 @@ + and LIBSOUP_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37532,7 +37308,7 @@ + and LIBSOUP_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -37640,7 +37416,7 @@ + and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37650,7 +37426,7 @@ + and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -37759,7 +37535,7 @@ + and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37769,7 +37545,7 @@ + and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -37879,7 +37655,7 @@ + and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -37889,7 +37665,7 @@ + and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -38026,7 +37802,7 @@ + and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -38036,7 +37812,7 @@ + and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -38319,7 +38095,7 @@ + and GSTREAMER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -38329,7 +38105,7 @@ + and GSTREAMER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -38441,7 +38217,7 @@ + and NMN_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -38451,7 +38227,7 @@ + and NMN_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -38535,7 +38311,9 @@ + # Put the nasty error message in config.log where it belongs + echo "$LIBEXCHANGESTORAGE_PKG_ERRORS" >&5 + +- have_libexchange="no" ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ have_libexchange="no" + elif test $pkg_failed = untried; then + have_libexchange="no" + else +@@ -38638,7 +38416,7 @@ + and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -38648,7 +38426,7 @@ + and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -38761,7 +38539,9 @@ + fi + fi + +- if test x$enable_gtk_doc = xyes; then ++ ++ ++if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' + else +@@ -38854,7 +38634,9 @@ + esac + fi + +- if test "$enable_schemas_install" != no; then ++ ++ ++if test "$enable_schemas_install" != no; then + GCONF_SCHEMAS_INSTALL_TRUE= + GCONF_SCHEMAS_INSTALL_FALSE='#' + else +@@ -38885,7 +38667,9 @@ + fi + + +- if test x$enable_default_binary = xyes; then ++ ++ ++if test x$enable_default_binary = xyes; then + DEFAULT_BINARY_TRUE= + DEFAULT_BINARY_FALSE='#' + else +@@ -38912,7 +38696,9 @@ + else + KDE_APPLNK_DIR="" + fi +- if test x"$KDE_APPLNK_DIR" != x; then ++ ++ ++if test x"$KDE_APPLNK_DIR" != x; then + HAVE_KDE_APPLNK_TRUE= + HAVE_KDE_APPLNK_FALSE='#' + else +@@ -39600,7 +39386,6 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' +-MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -39974,7 +39759,6 @@ + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim +-am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -39983,16 +39767,13 @@ + AUTOMAKE!$AUTOMAKE$ac_delim + AUTOHEADER!$AUTOHEADER$ac_delim + MAKEINFO!$MAKEINFO$ac_delim ++AMTAR!$AMTAR$ac_delim + install_sh!$install_sh$ac_delim + STRIP!$STRIP$ac_delim + INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +-mkdir_p!$mkdir_p$ac_delim + AWK!$AWK$ac_delim + SET_MAKE!$SET_MAKE$ac_delim + am__leading_dot!$am__leading_dot$ac_delim +-AMTAR!$AMTAR$ac_delim +-am__tar!$am__tar$ac_delim +-am__untar!$am__untar$ac_delim + build!$build$ac_delim + build_cpu!$build_cpu$ac_delim + build_vendor!$build_vendor$ac_delim +@@ -40012,6 +39793,10 @@ + LDFLAGS!$LDFLAGS$ac_delim + CPPFLAGS!$CPPFLAGS$ac_delim + ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then +@@ -40065,10 +39850,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-EXEEXT!$EXEEXT$ac_delim +-OBJEXT!$OBJEXT$ac_delim +-DEPDIR!$DEPDIR$ac_delim +-am__include!$am__include$ac_delim + am__quote!$am__quote$ac_delim + AMDEP_TRUE!$AMDEP_TRUE$ac_delim + AMDEP_FALSE!$AMDEP_FALSE$ac_delim +@@ -40109,9 +39890,6 @@ + INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim + INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim + INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim +-MSGMERGE!$MSGMERGE$ac_delim +-MSGFMT!$MSGFMT$ac_delim + INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +@@ -40119,8 +39897,10 @@ + ALL_LINGUAS!$ALL_LINGUAS$ac_delim + DATADIRNAME!$DATADIRNAME$ac_delim + USE_NLS!$USE_NLS$ac_delim ++MSGFMT!$MSGFMT$ac_delim + MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim + CATOBJEXT!$CATOBJEXT$ac_delim + GMOFILES!$GMOFILES$ac_delim +@@ -40132,6 +39912,7 @@ + POSUB!$POSUB$ac_delim + MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim + GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim ++SED!$SED$ac_delim + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim + RANLIB!$RANLIB$ac_delim +@@ -40162,6 +39943,10 @@ + PURIFY!$PURIFY$ac_delim + ENABLE_PURIFY_TRUE!$ENABLE_PURIFY_TRUE$ac_delim + ENABLE_PURIFY_FALSE!$ENABLE_PURIFY_FALSE$ac_delim ++ENABLE_TEST_COMPONENT_TRUE!$ENABLE_TEST_COMPONENT_TRUE$ac_delim ++ENABLE_TEST_COMPONENT_FALSE!$ENABLE_TEST_COMPONENT_FALSE$ac_delim ++GIT_CFLAGS!$GIT_CFLAGS$ac_delim ++GIT_LIBS!$GIT_LIBS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -40203,10 +39988,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-ENABLE_TEST_COMPONENT_TRUE!$ENABLE_TEST_COMPONENT_TRUE$ac_delim +-ENABLE_TEST_COMPONENT_FALSE!$ENABLE_TEST_COMPONENT_FALSE$ac_delim +-GIT_CFLAGS!$GIT_CFLAGS$ac_delim +-GIT_LIBS!$GIT_LIBS$ac_delim + A11Y_CFLAGS!$A11Y_CFLAGS$ac_delim + A11Y_LIBS!$A11Y_LIBS$ac_delim + LDAP_CFLAGS!$LDAP_CFLAGS$ac_delim +@@ -40260,7 +40041,6 @@ + GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim + GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim + GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim +-WARN_CFLAGS!$WARN_CFLAGS$ac_delim + X_CFLAGS!$X_CFLAGS$ac_delim + X_LIBS!$X_LIBS$ac_delim + XMKMF!$XMKMF$ac_delim +@@ -40300,6 +40080,11 @@ + NM_SUPPORT_GLIB_FALSE!$NM_SUPPORT_GLIB_FALSE$ac_delim + NM_SUPPORT_TRUE!$NM_SUPPORT_TRUE$ac_delim + NM_SUPPORT_FALSE!$NM_SUPPORT_FALSE$ac_delim ++SHELL_CFLAGS!$SHELL_CFLAGS$ac_delim ++SHELL_LIBS!$SHELL_LIBS$ac_delim ++EVOLUTION_ADDRESSBOOK_CFLAGS!$EVOLUTION_ADDRESSBOOK_CFLAGS$ac_delim ++EVOLUTION_ADDRESSBOOK_LIBS!$EVOLUTION_ADDRESSBOOK_LIBS$ac_delim ++EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS!$EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -40341,11 +40126,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-SHELL_CFLAGS!$SHELL_CFLAGS$ac_delim +-SHELL_LIBS!$SHELL_LIBS$ac_delim +-EVOLUTION_ADDRESSBOOK_CFLAGS!$EVOLUTION_ADDRESSBOOK_CFLAGS$ac_delim +-EVOLUTION_ADDRESSBOOK_LIBS!$EVOLUTION_ADDRESSBOOK_LIBS$ac_delim +-EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS!$EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS$ac_delim + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS!$EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS$ac_delim + LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim + LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim +@@ -40418,7 +40198,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -40645,11 +40425,6 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac +- ac_MKDIR_P=$MKDIR_P +- case $MKDIR_P in +- [\\/$]* | ?:[\\/]* ) ;; +- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; +- esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -40703,7 +40478,6 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t +-s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out + +@@ -40868,9 +40642,8 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +@@ -40897,21 +40670,27 @@ + else + continue + fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES from the Makefile without ++ # running `make'. ++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ U=`sed -n -e '/^U = / s///p' < "$mf"` ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # We invoke sed twice because it is the simplest approach to ++ # changing $(DEPDIR) to its actual value in the expansion. ++ for file in `sed -n -e ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +diff -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/appmanager/C +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = Ximian ++subdir = data/cde_app_root/dt/appconfig/appmanager/C ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,28 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/appmanager/C/Ximian +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(cdeappmanagerdir)" +-cdeappmanagerSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(cdeappmanager_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -85,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -96,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -121,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -146,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -154,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -212,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -236,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -260,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -268,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -275,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -284,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -306,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -336,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -355,56 +384,40 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + EXTRA_DIST = Evolution ++ + @HAVE_DTAPPINTEGRATE_TRUE@cdeappmanagerdir = $(privdatadir)/cde_app_root/dt/appconfig/appmanager/C/Ximian + @HAVE_DTAPPINTEGRATE_TRUE@cdeappmanager_SCRIPTS = Evolution ++subdir = data/cde_app_root/dt/appconfig/appmanager/C/Ximian ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SCRIPTS = $(cdeappmanager_SCRIPTS) ++ ++DIST_SOURCES = ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++cdeappmanagerSCRIPT_INSTALL = $(INSTALL_SCRIPT) + install-cdeappmanagerSCRIPTS: $(cdeappmanager_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(cdeappmanagerdir)" || $(MKDIR_P) "$(DESTDIR)$(cdeappmanagerdir)" ++ $(mkinstalldirs) $(DESTDIR)$(cdeappmanagerdir) + @list='$(cdeappmanager_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(cdeappmanagerSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(cdeappmanagerdir)/$$f'"; \ +- $(cdeappmanagerSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(cdeappmanagerdir)/$$f"; \ ++ echo " $(cdeappmanagerSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(cdeappmanagerdir)/$$f"; \ ++ $(cdeappmanagerSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(cdeappmanagerdir)/$$f; \ + else :; fi; \ + done + +@@ -412,8 +425,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(cdeappmanager_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(cdeappmanagerdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(cdeappmanagerdir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(cdeappmanagerdir)/$$f"; \ ++ rm -f $(DESTDIR)$(cdeappmanagerdir)/$$f; \ + done + + mostlyclean-libtool: +@@ -421,29 +434,38 @@ + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -457,10 +479,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(SCRIPTS) ++ + installdirs: +- for dir in "$(DESTDIR)$(cdeappmanagerdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(cdeappmanagerdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -480,7 +501,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -491,34 +512,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-cdeappmanagerSCRIPTS + +-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 +@@ -537,21 +548,18 @@ + + ps-am: + +-uninstall-am: uninstall-cdeappmanagerSCRIPTS +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-cdeappmanagerSCRIPTS uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ ++ dvi-am info info-am install install-am \ + install-cdeappmanagerSCRIPTS install-data install-data-am \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ ++ 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-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-cdeappmanagerSCRIPTS ++ ps ps-am uninstall uninstall-am uninstall-cdeappmanagerSCRIPTS \ ++ 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/appmanager +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = C ++subdir = data/cde_app_root/dt/appconfig/appmanager ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/C/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/C/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/C/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/C/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/icons/C +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(cdeiconsdir)" +-cdeiconsDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(cdeicons_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + ICONS = \ + Evolution.l.pm \ +@@ -375,63 +395,55 @@ + Ximian.m.pm \ + Ximian.t.pm + ++ + EXTRA_DIST = $(ICONS) ++ + @HAVE_DTAPPINTEGRATE_TRUE@cdeiconsdir = $(privdatadir)/cde_app_root/dt/appconfig/icons/C + @HAVE_DTAPPINTEGRATE_TRUE@cdeicons_DATA = $(ICONS) ++subdir = data/cde_app_root/dt/appconfig/icons/C ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(cdeicons_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/C/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/C/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++cdeiconsDATA_INSTALL = $(INSTALL_DATA) + install-cdeiconsDATA: $(cdeicons_DATA) + @$(NORMAL_INSTALL) +- test -z "$(cdeiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(cdeiconsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(cdeiconsdir) + @list='$(cdeicons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(cdeiconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cdeiconsdir)/$$f'"; \ +- $(cdeiconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cdeiconsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(cdeiconsDATA_INSTALL) $$d$$p $(DESTDIR)$(cdeiconsdir)/$$f"; \ ++ $(cdeiconsDATA_INSTALL) $$d$$p $(DESTDIR)$(cdeiconsdir)/$$f; \ + done + + uninstall-cdeiconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(cdeicons_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(cdeiconsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(cdeiconsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(cdeiconsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(cdeiconsdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -439,23 +451,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +486,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(cdeiconsdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(cdeiconsdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -492,7 +508,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -503,34 +519,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-cdeiconsDATA + +-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,21 +555,17 @@ + + ps-am: + +-uninstall-am: uninstall-cdeiconsDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-cdeiconsDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-cdeiconsDATA install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-cdeiconsDATA ++ dvi-am info info-am install install-am install-cdeiconsDATA \ ++ 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-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-cdeiconsDATA 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/icons +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = C ++subdir = data/cde_app_root/dt/appconfig/icons ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = appmanager icons types ++subdir = data/cde_app_root/dt/appconfig ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/C/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/types/C/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/C/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/types/C/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,35 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/types/C +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/Ximian.dt.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = Ximian.dt +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(cdetypesdir)" +-cdetypesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(cdetypes_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -92,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -103,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -128,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -153,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -161,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -219,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -243,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -267,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -275,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -282,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -291,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -313,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -343,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -362,48 +384,31 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + EXTRA_DIST = Ximian.dt.in ++ + @HAVE_DTAPPINTEGRATE_TRUE@cdetypesdir = $(privdatadir)/cde_app_root/dt/appconfig/types/C + @HAVE_DTAPPINTEGRATE_TRUE@cdetypes_DATA = Ximian.dt ++subdir = data/cde_app_root/dt/appconfig/types/C ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = Ximian.dt ++DIST_SOURCES = ++DATA = $(cdetypes_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Ximian.dt.in + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/C/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/C/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-Ximian.dt: $(top_builddir)/config.status $(srcdir)/Ximian.dt.in ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++Ximian.dt: $(top_builddir)/config.status Ximian.dt.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +@@ -411,22 +416,27 @@ + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++cdetypesDATA_INSTALL = $(INSTALL_DATA) + install-cdetypesDATA: $(cdetypes_DATA) + @$(NORMAL_INSTALL) +- test -z "$(cdetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(cdetypesdir)" ++ $(mkinstalldirs) $(DESTDIR)$(cdetypesdir) + @list='$(cdetypes_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(cdetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cdetypesdir)/$$f'"; \ +- $(cdetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cdetypesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(cdetypesDATA_INSTALL) $$d$$p $(DESTDIR)$(cdetypesdir)/$$f"; \ ++ $(cdetypesDATA_INSTALL) $$d$$p $(DESTDIR)$(cdetypesdir)/$$f; \ + done + + uninstall-cdetypesDATA: + @$(NORMAL_UNINSTALL) + @list='$(cdetypes_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(cdetypesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(cdetypesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(cdetypesdir)/$$f"; \ ++ rm -f $(DESTDIR)$(cdetypesdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -434,23 +444,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +479,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(cdetypesdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(cdetypesdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -487,7 +501,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -498,34 +512,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-cdetypesDATA + +-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,21 +548,17 @@ + + ps-am: + +-uninstall-am: uninstall-cdetypesDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-cdetypesDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-cdetypesDATA install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-cdetypesDATA ++ dvi-am info info-am install install-am install-cdetypesDATA \ ++ 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-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-cdetypesDATA 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/types/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/appconfig/types/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt/appconfig/types +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = C ++subdir = data/cde_app_root/dt/appconfig/types ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/Makefile.in evolution-2.12.2/data/cde_app_root/dt/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/dt/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/dt/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root/dt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = appconfig ++subdir = data/cde_app_root/dt ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/dt/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/Makefile.in evolution-2.12.2/data/cde_app_root/Makefile.in +--- evolution-2.12.2.orig/data/cde_app_root/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/cde_app_root/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data/cde_app_root +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = dt ++subdir = data/cde_app_root ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/cde_app_root/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/data/Makefile.in evolution-2.12.2/data/Makefile.in +--- evolution-2.12.2.orig/data/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/data/Makefile.in 2007-12-05 15:54:53.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,38 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = data +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-DATA = $(noinst_DATA) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -95,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -106,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -131,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -156,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -164,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -222,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -246,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -270,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -278,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -285,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -294,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -316,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -346,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -365,67 +384,63 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + desktopdir = $(datadir)/applications + desktop_in_in_file = evolution.desktop.in.in + desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) ++ + keysdir = $(datadir)/mime-info + keys_in_file = evolution.keys.in.in + keys_file = $(keys_in_file:.keys.in.in=.keys) ++ + mimedir = $(datadir)/mime-info + mime_file = evolution.mime ++ + @HAVE_KDE_APPLNK_TRUE@kdedesktopdir = $(KDE_APPLNK_DIR)/Applications + @HAVE_KDE_APPLNK_TRUE@kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) ++ + noinst_MANS = evolution.1 + noinst_DATA = $(keys_file) $(desktop_file) ++ + SUBDIRS = cde_app_root ++ + CLEANFILES = \ + $(desktop_file) \ + $(keys_file) + ++ + EXTRA_DIST = \ + $(desktop_in_in_file) \ + $(mime_file) \ + $(keys_in_file) \ + $(noinst_MANS) + ++subdir = data ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(noinst_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -433,6 +448,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, +@@ -440,13 +459,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -458,20 +471,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -492,7 +500,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -503,6 +511,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -511,22 +527,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -536,11 +549,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -563,23 +575,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -590,19 +607,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -612,6 +625,7 @@ + all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -632,7 +646,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -643,34 +657,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-data-local + +-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 +@@ -689,24 +694,26 @@ + + ps-am: + +-uninstall-am: uninstall-local ++uninstall-am: uninstall-info-am uninstall-local + +-.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 \ +- html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-local ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-local \ ++ install-data-recursive install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-recursive \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-local uninstall-recursive + + %.desktop.in: %.desktop.in.in + sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" -e "s|\@DATASERVER_EXEC_VERSION\@|$(DATASERVER_EXEC_VERSION)|" $< > $@ +diff -ruN evolution-2.12.2.orig/e-util/Makefile.in evolution-2.12.2/e-util/Makefile.in +--- evolution-2.12.2.orig/e-util/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/e-util/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,108 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = e-util +-DIST_COMMON = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(econdincludedir)" "$(DESTDIR)$(eutilincludedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libeconduit_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am__libeconduit_la_SOURCES_DIST = e-html-utils.c e-pilot-map.h \ +- e-pilot-util.h e-pilot-map.c e-pilot-util.c +-am__objects_1 = +-am__objects_2 = $(am__objects_1) e-pilot-map.lo e-pilot-util.lo +-@ENABLE_PILOT_CONDUITS_FALSE@am__objects_3 = e-html-utils.lo +-@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = $(am__objects_2) +-am_libeconduit_la_OBJECTS = $(am__objects_3) +-libeconduit_la_OBJECTS = $(am_libeconduit_la_OBJECTS) +-libeconduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libeconduit_la_LDFLAGS) $(LDFLAGS) -o $@ +-libeutil_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-am__libeutil_la_SOURCES_DIST = e-bconf-map.h e-categories-config.h \ +- e-config.h e-config-listener.h e-corba-utils.h e-cursor.h \ +- e-dialog-utils.h e-dialog-widgets.h e-error.h e-event.h \ +- e-folder-map.h e-fsutils.h e-gui-utils.h e-html-utils.h \ +- e-icon-factory.h e-import.h e-menu.h e-mktemp.h e-print.h \ +- e-plugin.h e-popup.h e-profile-event.h e-request.h \ +- e-signature.h e-signature-list.h e-bit-array.h e-sorter.h \ +- e-sorter-array.h e-text-event-processor-emacs-like.h \ +- e-text-event-processor-types.h e-text-event-processor.h \ +- e-util.h e-util-marshal.h e-xml-utils.h e-util-marshal.c \ +- e-bconf-map.c e-categories-config.c e-config.c \ +- e-config-listener.c e-corba-utils.c e-cursor.c \ +- e-dialog-utils.c e-dialog-widgets.c e-error.c e-event.c \ +- e-folder-map.c e-fsutils.c e-gui-utils.c e-html-utils.c \ +- e-icon-factory.c e-import.c e-menu.c e-mktemp.c e-plugin.c \ +- e-popup.c e-print.c e-profile-event.c e-request.c \ +- e-signature.c e-signature-list.c e-bit-array.c e-sorter.c \ +- e-sorter-array.c e-text-event-processor-emacs-like.c \ +- e-text-event-processor.c e-util.c e-util-private.h \ +- e-xml-utils.c e-win32-reloc.c +-@OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo +-am_libeutil_la_OBJECTS = $(am__objects_1) e-util-marshal.lo \ +- e-bconf-map.lo e-categories-config.lo e-config.lo \ +- e-config-listener.lo e-corba-utils.lo e-cursor.lo \ +- e-dialog-utils.lo e-dialog-widgets.lo e-error.lo e-event.lo \ +- e-folder-map.lo e-fsutils.lo e-gui-utils.lo e-html-utils.lo \ +- e-icon-factory.lo e-import.lo e-menu.lo e-mktemp.lo \ +- e-plugin.lo e-popup.lo e-print.lo e-profile-event.lo \ +- e-request.lo e-signature.lo e-signature-list.lo e-bit-array.lo \ +- e-sorter.lo e-sorter-array.lo \ +- e-text-event-processor-emacs-like.lo e-text-event-processor.lo \ +- e-util.lo e-xml-utils.lo $(am__objects_4) +-libeutil_la_OBJECTS = $(am_libeutil_la_OBJECTS) +-libeutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libeutil_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libeconduit_la_SOURCES) $(libeutil_la_SOURCES) +-DIST_SOURCES = $(am__libeconduit_la_SOURCES_DIST) \ +- $(am__libeutil_la_SOURCES_DIST) +-errorDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) +-econdincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-eutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -167,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -178,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -203,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -228,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -236,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -294,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -318,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -342,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -350,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -357,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -366,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -388,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -418,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -437,18 +384,17 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + eutilincludedir = $(privincludedir)/e-util + econdincludedir = $(privincludedir)/e-conduit + ecpsdir = $(privdatadir)/ecps + ruledir = $(privdatadir) ++ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la + @OS_WIN32_TRUE@PLATFORM_SOURCES = e-win32-reloc.c ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +@@ -478,7 +424,9 @@ + $(ICONV_CFLAGS) \ + $(E_UTIL_CFLAGS) + ++ + privsolib_LTLIBRARIES = libeutil.la libeconduit.la ++ + eutilinclude_HEADERS = \ + e-bconf-map.h \ + e-categories-config.h \ +@@ -515,6 +463,7 @@ + e-util-marshal.h \ + e-xml-utils.h + ++ + libeutil_la_SOURCES = \ + $(eutilinclude_HEADERS) \ + e-util-marshal.c \ +@@ -553,106 +502,200 @@ + e-xml-utils.c \ + $(PLATFORM_SOURCES) + ++ + MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h ++ + libeutil_la_LDFLAGS = $(NO_UNDEFINED) ++ + libeutil_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(ICONV_LIBS) \ + $(E_UTIL_LIBS) \ + $(INTLLIBS) + ++ + econdinclude_HEADERS = \ + e-pilot-map.h \ + e-pilot-util.h + ++ + pilot_sources = \ + $(econdinclude_HEADERS) \ + e-pilot-map.c \ + e-pilot-util.c + +-@ENABLE_PILOT_CONDUITS_FALSE@pilot_compile = e-html-utils.c ++ + @ENABLE_PILOT_CONDUITS_TRUE@pilot_compile = $(pilot_sources) ++@ENABLE_PILOT_CONDUITS_FALSE@pilot_compile = e-html-utils.c ++ + libeconduit_la_SOURCES = $(pilot_compile) ++ + libeconduit_la_LDFLAGS = $(NO_UNDEFINED) ++ + libeconduit_la_LIBADD = $(E_UTIL_LIBS) ++ + error_DATA = e-system.error + errordir = $(privdatadir)/errors ++ + EXTRA_DIST = \ + e-system.error.xml \ + $(pilot_sources) \ + ChangeLog.pre-1-4 \ + e-util-marshal.list + ++ + BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = e-util ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libeconduit_la_DEPENDENCIES = ++am__libeconduit_la_SOURCES_DIST = e-pilot-map.h e-pilot-util.h \ ++ e-pilot-map.c e-pilot-util.c e-html-utils.c ++am__objects_1 = ++am__objects_2 = $(am__objects_1) e-pilot-map.lo e-pilot-util.lo ++@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = $(am__objects_2) ++@ENABLE_PILOT_CONDUITS_FALSE@am__objects_3 = e-html-utils.lo ++am_libeconduit_la_OBJECTS = $(am__objects_3) ++libeconduit_la_OBJECTS = $(am_libeconduit_la_OBJECTS) ++@OS_WIN32_TRUE@libeutil_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la ++@OS_WIN32_FALSE@libeutil_la_DEPENDENCIES = ++am__libeutil_la_SOURCES_DIST = e-bconf-map.h e-categories-config.h \ ++ e-config.h e-config-listener.h e-corba-utils.h e-cursor.h \ ++ e-dialog-utils.h e-dialog-widgets.h e-error.h e-event.h \ ++ e-folder-map.h e-fsutils.h e-gui-utils.h e-html-utils.h \ ++ e-icon-factory.h e-import.h e-menu.h e-mktemp.h e-print.h \ ++ e-plugin.h e-popup.h e-profile-event.h e-request.h \ ++ e-signature.h e-signature-list.h e-bit-array.h e-sorter.h \ ++ e-sorter-array.h e-text-event-processor-emacs-like.h \ ++ e-text-event-processor-types.h e-text-event-processor.h \ ++ e-util.h e-util-marshal.h e-xml-utils.h e-util-marshal.c \ ++ e-bconf-map.c e-categories-config.c e-config.c \ ++ e-config-listener.c e-corba-utils.c e-cursor.c e-dialog-utils.c \ ++ e-dialog-widgets.c e-error.c e-event.c e-folder-map.c \ ++ e-fsutils.c e-gui-utils.c e-html-utils.c e-icon-factory.c \ ++ e-import.c e-menu.c e-mktemp.c e-plugin.c e-popup.c e-print.c \ ++ e-profile-event.c e-request.c e-signature.c e-signature-list.c \ ++ e-bit-array.c e-sorter.c e-sorter-array.c \ ++ e-text-event-processor-emacs-like.c e-text-event-processor.c \ ++ e-util.c e-util-private.h e-xml-utils.c e-win32-reloc.c ++@OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo ++am_libeutil_la_OBJECTS = $(am__objects_1) e-util-marshal.lo \ ++ e-bconf-map.lo e-categories-config.lo e-config.lo \ ++ e-config-listener.lo e-corba-utils.lo e-cursor.lo \ ++ e-dialog-utils.lo e-dialog-widgets.lo e-error.lo e-event.lo \ ++ e-folder-map.lo e-fsutils.lo e-gui-utils.lo e-html-utils.lo \ ++ e-icon-factory.lo e-import.lo e-menu.lo e-mktemp.lo e-plugin.lo \ ++ e-popup.lo e-print.lo e-profile-event.lo e-request.lo \ ++ e-signature.lo e-signature-list.lo e-bit-array.lo e-sorter.lo \ ++ e-sorter-array.lo e-text-event-processor-emacs-like.lo \ ++ e-text-event-processor.lo e-util.lo e-xml-utils.lo \ ++ $(am__objects_4) ++libeutil_la_OBJECTS = $(am_libeutil_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-bconf-map.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-bit-array.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-categories-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-config-listener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-corba-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cursor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-dialog-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-dialog-widgets.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-error.Plo ./$(DEPDIR)/e-event.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-folder-map.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-fsutils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-gui-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-html-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-icon-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-import.Plo ./$(DEPDIR)/e-menu.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-mktemp.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-pilot-map.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-pilot-util.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-plugin.Plo ./$(DEPDIR)/e-popup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-print.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-profile-event.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-request.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-signature-list.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-signature.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-sorter-array.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-sorter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-text-event-processor-emacs-like.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-text-event-processor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-util-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-util.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-win32-reloc.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-xml-utils.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(am__libeconduit_la_SOURCES_DIST) \ ++ $(am__libeutil_la_SOURCES_DIST) ++DATA = $(error_DATA) ++ ++HEADERS = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) ++ ++DIST_COMMON = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) \ ++ $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(libeconduit_la_SOURCES) $(libeutil_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu e-util/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu e-util/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libeconduit.la: $(libeconduit_la_OBJECTS) $(libeconduit_la_DEPENDENCIES) +- $(libeconduit_la_LINK) -rpath $(privsolibdir) $(libeconduit_la_OBJECTS) $(libeconduit_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libeconduit_la_LDFLAGS) $(libeconduit_la_OBJECTS) $(libeconduit_la_LIBADD) $(LIBS) + libeutil.la: $(libeutil_la_OBJECTS) $(libeutil_la_DEPENDENCIES) +- $(libeutil_la_LINK) -rpath $(privsolibdir) $(libeutil_la_OBJECTS) $(libeutil_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libeutil_la_LDFLAGS) $(libeutil_la_OBJECTS) $(libeutil_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -695,83 +738,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-xml-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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++econdincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-econdincludeHEADERS: $(econdinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(econdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(econdincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(econdincludedir) + @list='$(econdinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(econdincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(econdincludedir)/$$f'"; \ +- $(econdincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(econdincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(econdincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(econdincludedir)/$$f"; \ ++ $(econdincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(econdincludedir)/$$f; \ + done + + uninstall-econdincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(econdinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(econdincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(econdincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(econdincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(econdincludedir)/$$f; \ + done ++eutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-eutilincludeHEADERS: $(eutilinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(eutilincludedir)" || $(MKDIR_P) "$(DESTDIR)$(eutilincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(eutilincludedir) + @list='$(eutilinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(eutilincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eutilincludedir)/$$f'"; \ +- $(eutilincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eutilincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(eutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eutilincludedir)/$$f"; \ ++ $(eutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eutilincludedir)/$$f; \ + done + + uninstall-eutilincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(eutilinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(eutilincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(eutilincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(eutilincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(eutilincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -780,7 +850,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -792,11 +861,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -819,23 +887,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -853,10 +926,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(econdincludedir)" "$(DESTDIR)$(eutilincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(errordir) $(DESTDIR)$(econdincludedir) $(DESTDIR)$(eutilincludedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -878,7 +950,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -893,14 +965,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -908,20 +978,12 @@ + install-data-am: install-econdincludeHEADERS install-errorDATA \ + install-eutilincludeHEADERS install-privsolibLTLIBRARIES + +-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 +@@ -943,27 +1005,24 @@ + ps-am: + + uninstall-am: uninstall-econdincludeHEADERS uninstall-errorDATA \ +- uninstall-eutilincludeHEADERS uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++ uninstall-eutilincludeHEADERS uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-privsolibLTLIBRARIES ctags dist-hook \ +- 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 \ ++ clean-libtool clean-privsolibLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am \ + install-econdincludeHEADERS install-errorDATA \ + install-eutilincludeHEADERS install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ +- 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-econdincludeHEADERS uninstall-errorDATA \ +- uninstall-eutilincludeHEADERS uninstall-privsolibLTLIBRARIES ++ install-info install-info-am install-man \ ++ install-privsolibLTLIBRARIES 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-econdincludeHEADERS \ ++ uninstall-errorDATA uninstall-eutilincludeHEADERS \ ++ uninstall-info-am uninstall-privsolibLTLIBRARIES + + @EVO_MARSHAL_RULE@ + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/filter/Makefile.in evolution-2.12.2/filter/Makefile.in +--- evolution-2.12.2.orig/filter/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/filter/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,64 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = filter +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(gladedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libfilter_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_libfilter_la_OBJECTS = filter-code.lo filter-colour.lo \ +- filter-datespec.lo filter-element.lo filter-file.lo \ +- filter-input.lo filter-int.lo filter-label.lo \ +- filter-marshal.lo filter-option.lo filter-part.lo \ +- filter-rule.lo rule-context.lo rule-editor.lo +-libfilter_la_OBJECTS = $(am_libfilter_la_OBJECTS) +-libfilter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libfilter_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libfilter_la_SOURCES) +-DIST_SOURCES = $(libfilter_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -122,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -133,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -158,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -183,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -191,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -249,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -273,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -297,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -305,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -312,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -321,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -343,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -373,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -392,13 +384,12 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + glade_DATA = filter.glade ++ + INCLUDES = \ + -I $(top_srcdir) \ + -I $(top_srcdir)/e-util \ +@@ -407,9 +398,11 @@ + -DG_LOG_DOMAIN=\"filter\" \ + $(LIBFILTER_CFLAGS) + ++ + privsolib_LTLIBRARIES = \ + libfilter.la + ++ + libfilter_la_SOURCES = \ + filter-code.c \ + filter-code.h \ +@@ -440,12 +433,15 @@ + rule-editor.c \ + rule-editor.h + ++ + libfilter_la_LDFLAGS = $(NO_UNDEFINED) ++ + libfilter_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(LIBFILTER_LIBS) \ + $(REGEX_LIBS) + ++ + EXTRA_DIST = \ + $(glade_DATA) \ + filter.error.xml \ +@@ -456,75 +452,99 @@ + # basic rules. + error_DATA = filter.error + errordir = $(privdatadir)/errors ++ + MARSHAL_GENERATED = filter-marshal.c filter-marshal.h ++ + BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = filter ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libfilter_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la ++am_libfilter_la_OBJECTS = filter-code.lo filter-colour.lo \ ++ filter-datespec.lo filter-element.lo filter-file.lo \ ++ filter-input.lo filter-int.lo filter-label.lo filter-marshal.lo \ ++ filter-option.lo filter-part.lo filter-rule.lo rule-context.lo \ ++ rule-editor.lo ++libfilter_la_OBJECTS = $(am_libfilter_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/filter-code.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-colour.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-datespec.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-element.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-file.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-input.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-int.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-label.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-option.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-part.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/filter-rule.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/rule-context.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/rule-editor.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libfilter_la_SOURCES) ++DATA = $(error_DATA) $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(libfilter_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu filter/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu filter/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libfilter.la: $(libfilter_la_OBJECTS) $(libfilter_la_DEPENDENCIES) +- $(libfilter_la_LINK) -rpath $(privsolibdir) $(libfilter_la_OBJECTS) $(libfilter_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libfilter_la_LDFLAGS) $(libfilter_la_OBJECTS) $(libfilter_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -545,66 +565,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rule-editor.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -613,7 +659,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -625,11 +670,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -652,23 +696,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -683,10 +732,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -708,7 +756,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -723,14 +771,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -738,20 +784,12 @@ + install-data-am: install-errorDATA install-gladeDATA \ + install-privsolibLTLIBRARIES + +-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 +@@ -772,25 +810,21 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-gladeDATA \ ++uninstall-am: uninstall-errorDATA uninstall-gladeDATA uninstall-info-am \ + uninstall-privsolibLTLIBRARIES + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-errorDATA install-exec install-exec-am \ +- install-gladeDATA install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-gladeDATA install-info \ ++ install-info-am install-man install-privsolibLTLIBRARIES \ + 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-errorDATA uninstall-gladeDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ ++ uninstall-gladeDATA uninstall-info-am \ + uninstall-privsolibLTLIBRARIES + + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/help/Makefile.in evolution-2.12.2/help/Makefile.in +--- evolution-2.12.2.orig/help/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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. +@@ -37,11 +37,17 @@ + # the same distribution terms that you use for the rest of that program. + + ################################################################################ ++ ++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 +@@ -53,38 +59,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(top_srcdir)/gnome-doc-utils.make ChangeLog +-subdir = help +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +99,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +112,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +161,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +188,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +204,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +261,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +289,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +315,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +324,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +333,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +341,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +361,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +390,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,11 +408,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = quickref + _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) +@@ -401,9 +418,12 @@ + $(filter $(LINGUAS),$(DOC_LINGUAS)), \ + $(DOC_LINGUAS)) + ++ + _DOC_ABS_SRCDIR = @abs_srcdir@ ++ + @ENABLE_SK_TRUE@_ENABLE_SK = true + ++ + ################################################################################ + db2omf_args = \ + --stringparam db2omf.basename $(DOC_MODULE) \ +@@ -419,10 +439,13 @@ + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ + $(_db2omf) $(2) + ++ + _DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) ++ + _DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) + ++ + _DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) + +@@ -433,17 +456,23 @@ + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) + + ++ + ################################################################################ + _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) ++ + _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) ++ + _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) ++ + _DOC_C_DOCS = \ + $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ + $(_DOC_C_MODULE) + ++ + _DOC_C_DOCS_NOENT = \ + $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) + ++ + _DOC_C_FIGURES = $(if $(DOC_FIGURES), \ + $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) +@@ -457,13 +486,16 @@ + C/$(f).xhtml) + + ++ + ############################################################################### + _DOC_POFILES = $(if $(DOC_MODULE), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) + ++ + _DOC_LC_MODULES = $(if $(DOC_MODULE), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) + ++ + _DOC_LC_INCLUDES = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ + $(lc)/$(notdir $(inc)) )) +@@ -474,28 +506,36 @@ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ + $(lc)/$(notdir $(doc)) )) + ++ + _DOC_LC_DOCS = \ + $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) + ++ + _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ + $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) + ++ + _DOC_SRC_FIGURES = \ + $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ + $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) + ++ + _DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) + ++ + ################################################################################ + _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ + $(_DOC_C_HTML) $(_DOC_LC_HTML)) + ++ + _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) ++ + _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) + _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) + _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) + _clean_dir = $(if $(DOC_MODULE),clean-doc-dir) ++ + DOC_MODULE = evolution + DOC_ENTITIES = + DOC_INCLUDES = +@@ -614,39 +654,31 @@ + figures/ver_view_a.png \ + figures/vfolder-createrule-fig.png + ++ + DOC_LINGUAS = de el en_GB es fr oc ru sv ++subdir = help ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gnome-doc-utils.make \ ++ ChangeLog Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -654,6 +686,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, +@@ -661,13 +697,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -679,20 +709,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -713,7 +738,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -724,6 +749,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -732,22 +765,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -757,11 +787,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -784,23 +813,29 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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 \ ++ $(mkinstalldirs) $(distdir)/.. ++ @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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -811,19 +846,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -836,6 +867,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -855,7 +887,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -866,35 +898,25 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-local \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-libtool \ ++ distclean-local distclean-tags + + dvi: dvi-recursive + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-data-local + +-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 +@@ -915,26 +937,27 @@ + + ps-am: + +-uninstall-am: uninstall-local ++uninstall-am: uninstall-info-am uninstall-local + +-.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-local ctags ctags-recursive dist-hook distclean \ +- distclean-generic distclean-libtool distclean-local \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-local mostlyclean \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-local ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-local clean-recursive ctags \ ++ ctags-recursive distclean distclean-generic distclean-libtool \ ++ distclean-local distclean-recursive distclean-tags distdir dvi \ ++ dvi-am dvi-recursive info info-am info-recursive install \ ++ install-am install-data install-data-am install-data-local \ ++ install-data-recursive install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-recursive \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-local mostlyclean-recursive pdf \ ++ pdf-am pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-local uninstall-recursive + + + DOC_H_FILE ?= +diff -ruN evolution-2.12.2.orig/help/quickref/C/Makefile.in evolution-2.12.2/help/quickref/C/Makefile.in +--- evolution-2.12.2.orig/help/quickref/C/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/C/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/C +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/C + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/C ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/C/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/C/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/de/Makefile.in evolution-2.12.2/help/quickref/de/Makefile.in +--- evolution-2.12.2.orig/help/quickref/de/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/de/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/de +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/de + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/de ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/de/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/de/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/es/Makefile.in evolution-2.12.2/help/quickref/es/Makefile.in +--- evolution-2.12.2.orig/help/quickref/es/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/es/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/es +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/es + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/es ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/es/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/es/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/fr/Makefile.in evolution-2.12.2/help/quickref/fr/Makefile.in +--- evolution-2.12.2.orig/help/quickref/fr/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/fr/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/fr +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/fr + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/fr ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/fr/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/fr/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/it/Makefile.in evolution-2.12.2/help/quickref/it/Makefile.in +--- evolution-2.12.2.orig/help/quickref/it/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/it/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/it +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/it + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/it ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/it/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/it/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/Makefile.in evolution-2.12.2/help/quickref/Makefile.in +--- evolution-2.12.2.orig/help/quickref/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,46 +384,34 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = C de es fr it pl pt sv sq ++ + EXTRA_DIST = evolution-logo.eps ++subdir = help/quickref ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -410,6 +419,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, +@@ -417,13 +430,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -435,20 +442,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -469,7 +471,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -480,6 +482,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -488,22 +498,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -513,11 +520,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -540,23 +546,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -567,19 +578,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -589,6 +596,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -608,7 +616,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -619,34 +627,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -665,24 +664,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/help/quickref/pl/Makefile.in evolution-2.12.2/help/quickref/pl/Makefile.in +--- evolution-2.12.2.orig/help/quickref/pl/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/pl/Makefile.in 2007-12-05 15:54:54.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/pl +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/pl + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/pl ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/pl/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/pl/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/pt/Makefile.in evolution-2.12.2/help/quickref/pt/Makefile.in +--- evolution-2.12.2.orig/help/quickref/pt/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/pt/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/pt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/pt + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/pt ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/pt/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/pt/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/sq/Makefile.in evolution-2.12.2/help/quickref/sq/Makefile.in +--- evolution-2.12.2.orig/help/quickref/sq/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/sq/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/sq +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/sq + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/sq ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/sq/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/sq/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/help/quickref/sv/Makefile.in evolution-2.12.2/help/quickref/sv/Makefile.in +--- evolution-2.12.2.orig/help/quickref/sv/Makefile.in 2007-12-05 15:50:00.000000000 +0100 ++++ evolution-2.12.2/help/quickref/sv/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help/quickref/sv +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(quickrefdir)" +-quickrefDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(quickref_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,73 +384,62 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + HELP_FILES = quickref.pdf ++ + quickrefdir = $(evolutionhelpdir)/quickref/sv + quickref_DATA = $(HELP_FILES) ++ + EXTRA_DIST = \ + $(HELP_FILES) \ + quickref.tex + ++subdir = help/quickref/sv ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(quickref_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/sv/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/quickref/sv/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++quickrefDATA_INSTALL = $(INSTALL_DATA) + install-quickrefDATA: $(quickref_DATA) + @$(NORMAL_INSTALL) +- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + @list='$(quickref_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ ++ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ + done + + uninstall-quickrefDATA: + @$(NORMAL_UNINSTALL) + @list='$(quickref_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ ++ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -435,23 +447,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -465,10 +482,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(quickrefdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -488,7 +504,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -499,34 +515,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-quickrefDATA + +-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 +@@ -545,21 +551,17 @@ + + ps-am: + +-uninstall-am: uninstall-quickrefDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-quickrefDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-quickrefDATA \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-quickrefDATA ++ dvi-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-quickrefDATA install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-quickrefDATA + + # 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 -ruN evolution-2.12.2.orig/mail/default/C/Makefile.in evolution-2.12.2/mail/default/C/Makefile.in +--- evolution-2.12.2.orig/mail/default/C/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/C/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/C +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/C/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/C ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/C/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/C/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/de/Makefile.in evolution-2.12.2/mail/default/de/Makefile.in +--- evolution-2.12.2.orig/mail/default/de/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/de/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/de +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/de/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/de ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/de/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/de/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/es/Makefile.in evolution-2.12.2/mail/default/es/Makefile.in +--- evolution-2.12.2.orig/mail/default/es/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/es/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/es +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/es/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/es ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/es/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/es/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/fi/Makefile.in evolution-2.12.2/mail/default/fi/Makefile.in +--- evolution-2.12.2.orig/mail/default/fi/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/fi/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/fi +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/fi/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/fi ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/fi/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/fi/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/fr/Makefile.in evolution-2.12.2/mail/default/fr/Makefile.in +--- evolution-2.12.2.orig/mail/default/fr/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/mail/default/fr/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/fr +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/fr/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/fr ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/fr/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/fr/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/ja/Makefile.in evolution-2.12.2/mail/default/ja/Makefile.in +--- evolution-2.12.2.orig/mail/default/ja/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/mail/default/ja/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/ja +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/ja/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/ja ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/ja/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/ja/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/lt/Makefile.in evolution-2.12.2/mail/default/lt/Makefile.in +--- evolution-2.12.2.orig/mail/default/lt/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/lt/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/lt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/lt/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/lt ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/lt/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/lt/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/Makefile.in evolution-2.12.2/mail/default/Makefile.in +--- evolution-2.12.2.orig/mail/default/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,33 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + SUBDIRS = C zh_CN de es fi fr ja lt mk nl pl pt sv ++subdir = mail/default ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +418,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, +@@ -416,13 +429,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +441,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +470,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +481,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +497,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +519,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +545,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +577,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +595,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +615,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +626,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +663,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/mail/default/mk/Makefile.in evolution-2.12.2/mail/default/mk/Makefile.in +--- evolution-2.12.2.orig/mail/default/mk/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/mk/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/mk +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/mk/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/mk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/mk/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/mk/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/nl/Makefile.in evolution-2.12.2/mail/default/nl/Makefile.in +--- evolution-2.12.2.orig/mail/default/nl/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/nl/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/nl +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/nl/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/nl ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/nl/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/nl/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/pl/Makefile.in evolution-2.12.2/mail/default/pl/Makefile.in +--- evolution-2.12.2.orig/mail/default/pl/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/pl/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/pl +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/pl/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/pl ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/pl/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/pl/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/pt/Makefile.in evolution-2.12.2/mail/default/pt/Makefile.in +--- evolution-2.12.2.orig/mail/default/pt/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/pt/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/pt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/pt/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/pt ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/pt/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/pt/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/sv/Makefile.in evolution-2.12.2/mail/default/sv/Makefile.in +--- evolution-2.12.2.orig/mail/default/sv/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/sv/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/sv +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/sv/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/sv ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/sv/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/sv/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/default/zh_CN/Makefile.in evolution-2.12.2/mail/default/zh_CN/Makefile.in +--- evolution-2.12.2.orig/mail/default/zh_CN/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/default/zh_CN/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/default/zh_CN +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(defaultlocaldir)" +-defaultlocalDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(defaultlocal_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,71 +384,61 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + defaultlocaldir = $(privdatadir)/default/zh_CN/mail/local ++ + defaultlocal_DATA = \ + Inbox + ++ + EXTRA_DIST = $(defaultlocal_DATA) ++subdir = mail/default/zh_CN ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(defaultlocal_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/zh_CN/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/default/zh_CN/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++defaultlocalDATA_INSTALL = $(INSTALL_DATA) + install-defaultlocalDATA: $(defaultlocal_DATA) + @$(NORMAL_INSTALL) +- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + + uninstall-defaultlocalDATA: + @$(NORMAL_UNINSTALL) + @list='$(defaultlocal_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ ++ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -433,23 +446,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -463,10 +481,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -486,7 +503,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,34 +514,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-defaultlocalDATA + +-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 +@@ -543,21 +550,18 @@ + + ps-am: + +-uninstall-am: uninstall-defaultlocalDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-defaultlocalDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-defaultlocalDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-defaultlocalDATA \ ++ 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 -ruN evolution-2.12.2.orig/mail/importers/Makefile.in evolution-2.12.2/mail/importers/Makefile.in +--- evolution-2.12.2.orig/mail/importers/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/mail/importers/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail/importers +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_mail_importers_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) +-am_libevolution_mail_importers_la_OBJECTS = mail-importer.lo \ +- elm-importer.lo pine-importer.lo evolution-mbox-importer.lo +-libevolution_mail_importers_la_OBJECTS = \ +- $(am_libevolution_mail_importers_la_OBJECTS) +-libevolution_mail_importers_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_mail_importers_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_mail_importers_la_SOURCES) +-DIST_SOURCES = $(libevolution_mail_importers_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,14 +384,13 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la ++ + privsolib_LTLIBRARIES = libevolution-mail-importers.la ++ + INCLUDES = -I.. \ + -I$(srcdir)/.. \ + -I$(top_srcdir) \ +@@ -404,6 +400,7 @@ + -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ + $(IMPORTERS_CFLAGS) + ++ + libevolution_mail_importers_la_SOURCES = \ + mail-importer.c \ + mail-importer.h \ +@@ -411,8 +408,10 @@ + pine-importer.c \ + evolution-mbox-importer.c + ++ + libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) + ++ + # these haven't been converted to plugins yet + # netscape-importer.c + # evolution-outlook-importer.c +@@ -422,71 +421,85 @@ + $(top_builddir)/filter/libfilter.la \ + $(IMPORTERS_LIBS) + ++subdir = mail/importers ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libevolution_mail_importers_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-mail.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/filter/libfilter.la ++@OS_WIN32_FALSE@libevolution_mail_importers_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/filter/libfilter.la ++am_libevolution_mail_importers_la_OBJECTS = mail-importer.lo \ ++ elm-importer.lo pine-importer.lo evolution-mbox-importer.lo ++libevolution_mail_importers_la_OBJECTS = \ ++ $(am_libevolution_mail_importers_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/elm-importer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mbox-importer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-importer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/pine-importer.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_mail_importers_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_mail_importers_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/importers/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/importers/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-mail-importers.la: $(libevolution_mail_importers_la_OBJECTS) $(libevolution_mail_importers_la_DEPENDENCIES) +- $(libevolution_mail_importers_la_LINK) -rpath $(privsolibdir) $(libevolution_mail_importers_la_OBJECTS) $(libevolution_mail_importers_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_mail_importers_la_LDFLAGS) $(libevolution_mail_importers_la_OBJECTS) $(libevolution_mail_importers_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -497,25 +510,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pine-importer.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -523,6 +548,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -531,7 +568,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -543,11 +579,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -570,23 +605,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -600,10 +640,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -623,7 +662,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +676,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -685,23 +714,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/mail/Makefile.in evolution-2.12.2/mail/Makefile.in +--- evolution-2.12.2.orig/mail/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/mail/Makefile.in 2007-12-05 15:54:55.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,111 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = mail +-DIST_COMMON = $(mailinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(filterdir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" \ +- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" \ +- "$(DESTDIR)$(mailincludedir)" +-componentLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(component_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-am__objects_1 = Spell-common.lo Spell-skels.lo Spell-stubs.lo +-am__objects_2 = +-am__objects_3 = $(am__objects_1) $(am__objects_2) +-am__objects_4 = Evolution-Mail-common.lo Evolution-Mail-skels.lo \ +- Evolution-Mail-stubs.lo +-am__objects_5 = $(am__objects_4) $(am__objects_2) +-am__objects_6 = em-marshal.lo +-am__objects_7 = $(am__objects_2) +-am_libevolution_mail_la_OBJECTS = $(am__objects_3) $(am__objects_5) \ +- $(am__objects_6) $(am__objects_7) e-searching-tokenizer.lo \ +- em-account-editor.lo em-account-prefs.lo em-composer-prefs.lo \ +- em-composer-utils.lo em-config.lo em-event.lo \ +- em-filter-context.lo em-filter-editor.lo \ +- em-filter-folder-element.lo em-filter-rule.lo \ +- em-filter-source-element.lo em-folder-browser.lo \ +- em-folder-properties.lo em-folder-selection-button.lo \ +- em-folder-selection.lo em-folder-selector.lo \ +- em-folder-tree-model.lo em-folder-tree.lo em-folder-utils.lo \ +- em-folder-view.lo em-format-hook.lo em-format-html-display.lo \ +- em-format-html-print.lo em-format-html.lo em-format-quote.lo \ +- em-format.lo em-html-stream.lo em-icon-stream.lo \ +- em-inline-filter.lo em-junk-hook.lo em-mailer-prefs.lo \ +- em-menu.lo em-message-browser.lo em-migrate.lo em-popup.lo \ +- em-search-context.lo em-stripsig-filter.lo \ +- em-subscribe-editor.lo em-sync-stream.lo em-utils.lo \ +- em-vfolder-context.lo em-vfolder-editor.lo em-vfolder-rule.lo \ +- em-vfs-stream.lo mail-autofilter.lo mail-component-factory.lo \ +- mail-component.lo mail-config-factory.lo mail-config.lo \ +- mail-crypto.lo mail-folder-cache.lo mail-mt.lo mail-ops.lo \ +- mail-send-recv.lo mail-session.lo mail-signature-editor.lo \ +- mail-tools.lo mail-vfolder.lo message-list.lo \ +- message-tag-editor.lo message-tag-followup.lo +-libevolution_mail_la_OBJECTS = $(am_libevolution_mail_la_OBJECTS) +-libevolution_mail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_mail_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_mail_la_SOURCES) +-DIST_SOURCES = $(libevolution_mail_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 +-errorDATA_INSTALL = $(INSTALL_DATA) +-etspecDATA_INSTALL = $(INSTALL_DATA) +-filterDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-idlDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-serverDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(etspec_DATA) $(filter_DATA) $(glade_DATA) \ +- $(idl_DATA) $(schema_DATA) $(server_DATA) +-mailincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(mailinclude_HEADERS) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -170,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -181,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -206,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -231,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -239,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -297,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -321,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -345,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -353,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -360,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -369,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -391,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -421,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -440,14 +384,13 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = default importers ++ + mailincludedir = $(privincludedir)/mail ++ + INCLUDES = \ + -I$(top_srcdir)/widgets \ + -I$(top_srcdir)/widgets/e-text \ +@@ -477,10 +420,13 @@ + -DPREFIX=\""$(prefix)"\" \ + -DG_LOG_DOMAIN=\"evolution-mail\" + ++ + component_LTLIBRARIES = libevolution-mail.la + ++ + # Code generation for Spell.idl + SPELL_IDL = Spell.idl ++ + SPELL_IDL_GENERATED_H = \ + Spell.h + +@@ -503,6 +449,7 @@ + + MAIL_IDL_GENERATED = $(MAIL_IDL_GENERATED_C) $(MAIL_IDL_GENERATED_H) + ++ + # IDL install + idl_DATA = $(MAIL_IDL) + +@@ -545,6 +492,7 @@ + mail-vfolder.h + + ++ + # libevolution-mail + libevolution_mail_la_SOURCES = \ + $(SPELL_IDL_GENERATED) \ +@@ -642,10 +590,12 @@ + message-tag-followup.c \ + message-tag-followup.h + ++ + @ENABLE_SMIME_TRUE@SMIME_LIBS = \ + @ENABLE_SMIME_TRUE@ $(top_builddir)/smime/lib/libessmime.la \ + @ENABLE_SMIME_TRUE@ $(top_builddir)/smime/gui/libevolution-smime.la + ++ + libevolution_mail_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la \ +@@ -666,11 +616,14 @@ + $(REGEX_LIBS) \ + $(THREADS_LIBS) + ++ + libevolution_mail_la_LDFLAGS = \ + -avoid-version -module $(NO_UNDEFINED) + ++ + libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h + ++ + # .server files + server_in_files = GNOME_Evolution_Mail.server.in.in + server_DATA = $(server_in_files:.server.in.in=.server) +@@ -678,11 +631,15 @@ + # Misc data to install + filterdir = $(privdatadir) + filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml ++ + error_DATA = mail.error + errordir = $(privdatadir)/errors ++ + glade_DATA = mail-config.glade mail-dialogs.glade + MARSHAL_GENERATED = em-marshal.c em-marshal.h ++ + etspec_DATA = message-list.etspec ++ + EXTRA_DIST = \ + ChangeLog.pre-1-4 \ + em-marshal.list \ +@@ -699,82 +656,197 @@ + em-filter-i18n.h + + ++ + # Purify support + @ENABLE_PURIFY_TRUE@PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + ++ + # GConf + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = evolution-mail.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MAIL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA) ++ + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++subdir = mail ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(component_LTLIBRARIES) ++ ++am__objects_1 = Spell-common.lo Spell-skels.lo Spell-stubs.lo ++am__objects_2 = ++am__objects_3 = $(am__objects_1) $(am__objects_2) ++am__objects_4 = Evolution-Mail-common.lo Evolution-Mail-skels.lo \ ++ Evolution-Mail-stubs.lo ++am__objects_5 = $(am__objects_4) $(am__objects_2) ++am__objects_6 = em-marshal.lo ++am__objects_7 = $(am__objects_2) ++am_libevolution_mail_la_OBJECTS = $(am__objects_3) $(am__objects_5) \ ++ $(am__objects_6) $(am__objects_7) e-searching-tokenizer.lo \ ++ em-account-editor.lo em-account-prefs.lo em-composer-prefs.lo \ ++ em-composer-utils.lo em-config.lo em-event.lo \ ++ em-filter-context.lo em-filter-editor.lo \ ++ em-filter-folder-element.lo em-filter-rule.lo \ ++ em-filter-source-element.lo em-folder-browser.lo \ ++ em-folder-properties.lo em-folder-selection-button.lo \ ++ em-folder-selection.lo em-folder-selector.lo \ ++ em-folder-tree-model.lo em-folder-tree.lo em-folder-utils.lo \ ++ em-folder-view.lo em-format-hook.lo em-format-html-display.lo \ ++ em-format-html-print.lo em-format-html.lo em-format-quote.lo \ ++ em-format.lo em-html-stream.lo em-icon-stream.lo \ ++ em-inline-filter.lo em-junk-hook.lo em-mailer-prefs.lo \ ++ em-menu.lo em-message-browser.lo em-migrate.lo em-popup.lo \ ++ em-search-context.lo em-stripsig-filter.lo \ ++ em-subscribe-editor.lo em-sync-stream.lo em-utils.lo \ ++ em-vfolder-context.lo em-vfolder-editor.lo em-vfolder-rule.lo \ ++ em-vfs-stream.lo mail-autofilter.lo mail-component-factory.lo \ ++ mail-component.lo mail-config-factory.lo mail-config.lo \ ++ mail-crypto.lo mail-folder-cache.lo mail-mt.lo mail-ops.lo \ ++ mail-send-recv.lo mail-session.lo mail-signature-editor.lo \ ++ mail-tools.lo mail-vfolder.lo message-list.lo \ ++ message-tag-editor.lo message-tag-followup.lo ++libevolution_mail_la_OBJECTS = $(am_libevolution_mail_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-Mail-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Mail-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Mail-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Spell-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Spell-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Spell-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-searching-tokenizer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-account-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-account-prefs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-composer-prefs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-composer-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-config.Plo ./$(DEPDIR)/em-event.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-context.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-folder-element.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-rule.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-source-element.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-browser.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-properties.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-selection-button.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-selection.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-selector.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-tree-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-tree.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-format-hook.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-format-html-display.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-format-html-print.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-format-html.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-format-quote.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-format.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-html-stream.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-icon-stream.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-inline-filter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-junk-hook.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-mailer-prefs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-marshal.Plo ./$(DEPDIR)/em-menu.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-message-browser.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-migrate.Plo ./$(DEPDIR)/em-popup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-search-context.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-stripsig-filter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-subscribe-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-sync-stream.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-vfolder-context.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-vfolder-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-vfolder-rule.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-vfs-stream.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-autofilter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-component-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-config-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-crypto.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-folder-cache.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-mt.Plo ./$(DEPDIR)/mail-ops.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-send-recv.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-session.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-signature-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-tools.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-vfolder.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/message-list.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/message-tag-editor.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/message-tag-followup.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_mail_la_SOURCES) ++DATA = $(error_DATA) $(etspec_DATA) $(filter_DATA) $(glade_DATA) \ ++ $(idl_DATA) $(schema_DATA) $(server_DATA) ++ ++HEADERS = $(mailinclude_HEADERS) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(mailinclude_HEADERS) $(srcdir)/Makefile.in ChangeLog \ ++ Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) ++SOURCES = $(libevolution_mail_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mail/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++componentLTLIBRARIES_INSTALL = $(INSTALL) + install-componentLTLIBRARIES: $(component_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ + else :; fi; \ + done + + uninstall-componentLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ + done + + clean-componentLTLIBRARIES: + -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-mail.la: $(libevolution_mail_la_OBJECTS) $(libevolution_mail_la_DEPENDENCIES) +- $(libevolution_mail_la_LINK) -rpath $(componentdir) $(libevolution_mail_la_OBJECTS) $(libevolution_mail_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(componentdir) $(libevolution_mail_la_LDFLAGS) $(libevolution_mail_la_OBJECTS) $(libevolution_mail_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -850,166 +922,190 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message-tag-followup.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++etspecDATA_INSTALL = $(INSTALL_DATA) + install-etspecDATA: $(etspec_DATA) + @$(NORMAL_INSTALL) +- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(etspecdir) + @list='$(etspec_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ +- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ ++ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ + done + + uninstall-etspecDATA: + @$(NORMAL_UNINSTALL) + @list='$(etspec_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(etspecdir)/$$f; \ + done ++filterDATA_INSTALL = $(INSTALL_DATA) + install-filterDATA: $(filter_DATA) + @$(NORMAL_INSTALL) +- test -z "$(filterdir)" || $(MKDIR_P) "$(DESTDIR)$(filterdir)" ++ $(mkinstalldirs) $(DESTDIR)$(filterdir) + @list='$(filter_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(filterDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(filterdir)/$$f'"; \ +- $(filterDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(filterdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(filterDATA_INSTALL) $$d$$p $(DESTDIR)$(filterdir)/$$f"; \ ++ $(filterDATA_INSTALL) $$d$$p $(DESTDIR)$(filterdir)/$$f; \ + done + + uninstall-filterDATA: + @$(NORMAL_UNINSTALL) + @list='$(filter_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(filterdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(filterdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(filterdir)/$$f"; \ ++ rm -f $(DESTDIR)$(filterdir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++idlDATA_INSTALL = $(INSTALL_DATA) + install-idlDATA: $(idl_DATA) + @$(NORMAL_INSTALL) +- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" ++ $(mkinstalldirs) $(DESTDIR)$(idldir) + @list='$(idl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ +- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ ++ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ + done + + uninstall-idlDATA: + @$(NORMAL_UNINSTALL) + @list='$(idl_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ ++ rm -f $(DESTDIR)$(idldir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done ++serverDATA_INSTALL = $(INSTALL_DATA) + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" ++ $(mkinstalldirs) $(DESTDIR)$(serverdir) + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ +- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ ++ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ + done + + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ++ rm -f $(DESTDIR)$(serverdir)/$$f; \ + done ++mailincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-mailincludeHEADERS: $(mailinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(mailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(mailincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(mailincludedir) + @list='$(mailinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(mailincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(mailincludedir)/$$f'"; \ +- $(mailincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(mailincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(mailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(mailincludedir)/$$f"; \ ++ $(mailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(mailincludedir)/$$f; \ + done + + uninstall-mailincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(mailinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(mailincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(mailincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(mailincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(mailincludedir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -1019,13 +1115,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1037,20 +1127,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -1071,7 +1156,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1082,6 +1167,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -1090,22 +1183,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -1115,11 +1205,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -1142,23 +1231,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -1169,19 +1263,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1192,13 +1282,11 @@ + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-@ENABLE_PURIFY_FALSE@all-local: + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(filterdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(mailincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(errordir) $(DESTDIR)$(etspecdir) $(DESTDIR)$(filterdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(idldir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) $(DESTDIR)$(mailincludedir) ++ + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -1220,7 +1308,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -1236,14 +1324,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-recursive + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: +@@ -1253,20 +1339,12 @@ + install-gladeDATA install-idlDATA install-mailincludeHEADERS \ + install-schemaDATA install-serverDATA + +-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 +@@ -1289,33 +1367,35 @@ + + uninstall-am: uninstall-componentLTLIBRARIES uninstall-errorDATA \ + uninstall-etspecDATA uninstall-filterDATA uninstall-gladeDATA \ +- uninstall-idlDATA uninstall-mailincludeHEADERS \ +- uninstall-schemaDATA uninstall-serverDATA +- +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am all-local check check-am clean \ +- clean-componentLTLIBRARIES clean-generic clean-libtool ctags \ +- ctags-recursive dist-hook distclean distclean-compile \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ ++ uninstall-idlDATA uninstall-info-am \ ++ uninstall-mailincludeHEADERS uninstall-schemaDATA \ ++ uninstall-serverDATA ++ ++uninstall-info: uninstall-info-recursive ++ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ ++ check-am clean clean-componentLTLIBRARIES clean-generic \ ++ clean-libtool clean-recursive ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-recursive distclean-tags distdir dvi dvi-am \ ++ dvi-recursive info info-am info-recursive install install-am \ + install-componentLTLIBRARIES install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ +- install-errorDATA install-etspecDATA install-exec \ +- install-exec-am install-filterDATA install-gladeDATA \ +- install-html install-html-am install-idlDATA install-info \ +- install-info-am install-mailincludeHEADERS install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-schemaDATA install-serverDATA install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ ++ install-data-local install-data-recursive install-errorDATA \ ++ install-etspecDATA install-exec install-exec-am \ ++ install-exec-recursive install-filterDATA install-gladeDATA \ ++ install-idlDATA install-info install-info-am \ ++ install-info-recursive install-mailincludeHEADERS install-man \ ++ install-recursive install-schemaDATA install-serverDATA \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ ++ ps-recursive tags tags-recursive uninstall uninstall-am \ + uninstall-componentLTLIBRARIES uninstall-errorDATA \ + uninstall-etspecDATA uninstall-filterDATA uninstall-gladeDATA \ +- uninstall-idlDATA uninstall-mailincludeHEADERS \ ++ uninstall-idlDATA uninstall-info-am uninstall-info-recursive \ ++ uninstall-mailincludeHEADERS uninstall-recursive \ + uninstall-schemaDATA uninstall-serverDATA + + +diff -ruN evolution-2.12.2.orig/Makefile.in evolution-2.12.2/Makefile.in +--- evolution-2.12.2.orig/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/Makefile.in 2007-12-05 15:54:50.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,67 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +- $(srcdir)/evolution-plugin.pc.in \ +- $(srcdir)/evolution-shell.pc.in $(srcdir)/evolution-zip.in \ +- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ +- config.guess config.sub depcomp install-sh ltmain.sh missing \ +- mkinstalldirs +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno config.status.lineno +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = evolution-zip evolution-shell.pc \ +- evolution-plugin.pc +-SOURCES = +-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 +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(pkgconfig_DATA) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = win32 data e-util a11y widgets shell filter smime \ +- addressbook calendar art composer mail plugins ui views tools \ +- help po +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -124,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -135,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -160,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -185,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -193,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -251,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -275,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -299,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -307,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -314,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -323,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -345,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -375,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -394,21 +384,20 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + changelogs = \ + ChangeLog \ + ChangeLog.pre-1-4 + ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = \ + evolution-shell.pc \ + evolution-plugin.pc + ++ + EXTRA_DIST = \ + AUTHORS \ + $(changelogs) \ +@@ -429,7 +418,9 @@ + gnome-doc-utils.make \ + $(pkgconfig_DATA:.pc=.pc.in) + ++ + @ENABLE_SMIME_TRUE@SMIME_DIR = smime ++ + SUBDIRS = \ + win32 \ + data \ +@@ -451,6 +442,7 @@ + help \ + po + ++ + DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ +@@ -463,65 +455,72 @@ + # Scrollkeeper must be disabled for distcheck to work because + # distcheck uses a custom prefix. See GNOME bug #354357. + DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = evolution-zip evolution-shell.pc \ ++ evolution-plugin.pc ++DIST_SOURCES = ++DATA = $(pkgconfig_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ++ COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \ ++ aclocal.m4 config.guess config.h.in config.sub configure \ ++ configure.in depcomp evolution-plugin.pc.in \ ++ evolution-shell.pc.in evolution-zip.in install-sh ltmain.sh \ ++ missing mkinstalldirs ++DIST_SUBDIRS = win32 data e-util a11y widgets shell filter smime \ ++ addressbook calendar art composer mail plugins ui views tools \ ++ help po + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-am--refresh: +- @: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ +- cd $(srcdir) && $(AUTOMAKE) --gnu \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- echo ' $(SHELL) ./config.status'; \ +- $(SHELL) ./config.status;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ +- esac; ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ ++ $(MAKE) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOHEADER) +- rm -f stamp-h1 +- touch $@ ++ touch $(srcdir)/config.h.in + + distclean-hdr: + -rm -f config.h stamp-h1 +-evolution-zip: $(top_builddir)/config.status $(srcdir)/evolution-zip.in ++evolution-zip: $(top_builddir)/config.status evolution-zip.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-evolution-shell.pc: $(top_builddir)/config.status $(srcdir)/evolution-shell.pc.in ++evolution-shell.pc: $(top_builddir)/config.status evolution-shell.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-evolution-plugin.pc: $(top_builddir)/config.status $(srcdir)/evolution-plugin.pc.in ++evolution-plugin.pc: $(top_builddir)/config.status evolution-plugin.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + mostlyclean-libtool: +@@ -532,22 +531,24 @@ + + distclean-libtool: + -rm -f libtool ++uninstall-info-am: ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -557,13 +558,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -575,20 +570,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -609,7 +599,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -620,6 +610,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -628,22 +626,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -653,11 +648,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -680,25 +674,40 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = . ++distdir = $(PACKAGE)-$(VERSION) ++ ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++ ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ mkdir $(distdir) ++ $(mkinstalldirs) $(distdir)/. $(distdir)/addressbook/tools $(distdir)/data/cde_app_root/dt/appconfig/types/C $(distdir)/po $(distdir)/shell ++ @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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -711,17 +720,13 @@ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -729,49 +734,22 @@ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) +- +-dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) +- +-dist-shar: distdir +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. + distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac ++ $(am__remove_distdir) ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst +@@ -791,20 +769,19 @@ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ++ && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) +- @(echo "$(distdir) archives ready for distribution: "; \ +- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++ @echo "$(distdir).tar.gz is ready for distribution" | \ ++ sed 'h;s/./=/g;p;x;p;x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -828,9 +805,8 @@ + all-am: Makefile $(DATA) config.h + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -850,7 +826,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -863,35 +839,25 @@ + distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-hdr \ +- distclean-libtool distclean-tags ++distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-pkgconfigDATA + +-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 +@@ -912,27 +878,29 @@ + + ps-am: + +-uninstall-am: uninstall-pkgconfigDATA ++uninstall-am: uninstall-info-am uninstall-pkgconfigDATA + +-.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 am--refresh check check-am clean clean-generic \ +- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ ++ ctags-recursive dist dist-all dist-gzip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-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-pkgconfigDATA install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-pkgconfigDATA ++ distclean-recursive distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ ++ info-recursive install install-am install-data install-data-am \ ++ install-data-recursive install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-pkgconfigDATA \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-pkgconfigDATA \ ++ uninstall-recursive + + + # CDE Stuff +diff -ruN evolution-2.12.2.orig/plugins/addressbook-file/Makefile.in evolution-2.12.2/plugins/addressbook-file/Makefile.in +--- evolution-2.12.2.orig/plugins/addressbook-file/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/addressbook-file/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/addressbook-file +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_addressbook_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am_liborg_gnome_addressbook_file_la_OBJECTS = addressbook-file.lo +-liborg_gnome_addressbook_file_la_OBJECTS = \ +- $(am_liborg_gnome_addressbook_file_la_OBJECTS) +-liborg_gnome_addressbook_file_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_addressbook_file_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,92 +384,99 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + plugin_DATA = org-gnome-addressbook-file.eplug + plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la ++ + liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c + liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_addressbook_file_la_LIBADD = \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + EXTRA_DIST = org-gnome-addressbook-file.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/addressbook-file ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_addressbook_file_la_DEPENDENCIES = ++am_liborg_gnome_addressbook_file_la_OBJECTS = addressbook-file.lo ++liborg_gnome_addressbook_file_la_OBJECTS = \ ++ $(am_liborg_gnome_addressbook_file_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addressbook-file.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/addressbook-file/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/addressbook-file/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-addressbook-file.la: $(liborg_gnome_addressbook_file_la_OBJECTS) $(liborg_gnome_addressbook_file_la_DEPENDENCIES) +- $(liborg_gnome_addressbook_file_la_LINK) -rpath $(plugindir) $(liborg_gnome_addressbook_file_la_OBJECTS) $(liborg_gnome_addressbook_file_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_addressbook_file_la_LDFLAGS) $(liborg_gnome_addressbook_file_la_OBJECTS) $(liborg_gnome_addressbook_file_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -480,49 +484,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addressbook-file.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -531,7 +560,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -543,11 +571,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -570,23 +597,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -601,10 +633,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -626,7 +657,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -641,34 +672,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -689,23 +710,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/attachment-reminder/Makefile.in evolution-2.12.2/plugins/attachment-reminder/Makefile.in +--- evolution-2.12.2.orig/plugins/attachment-reminder/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/attachment-reminder/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,64 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/attachment-reminder +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_evolution_attachment_reminder_la_LIBADD = +-am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ +- attachment-reminder.lo +-liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS) +-liborg_gnome_evolution_attachment_reminder_la_LINK = $(LIBTOOL) \ +- --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ +- $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_attachment_reminder_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) +-DIST_SOURCES = \ +- $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -122,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -133,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -158,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -183,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -191,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -249,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -273,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -297,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -305,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -312,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -321,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -343,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -373,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -392,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_builddir)/composer \ +@@ -404,96 +393,113 @@ + $(EVOLUTION_MAIL_CFLAGS) \ + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + ++ + error_DATA = \ + org-gnome-attachment-reminder.error + ++ + errordir = $(privdatadir)/errors ++ + plugin_DATA = \ + org-gnome-evolution-attachment-reminder.eplug \ + attachment-reminder.glade + ++ + plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la ++ + liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c + liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version ++ + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = apps-evolution-attachment-reminder.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ + org-gnome-attachment-reminder.error.xml \ + $(schema_in_files) \ + attachment-reminder.glade + ++ + BUILT_SOURCES = org-gnome-evolution-attachment-reminder.eplug \ + org-gnome-attachment-reminder.error + ++ + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++subdir = plugins/attachment-reminder ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_attachment_reminder_la_LIBADD = ++am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ ++ attachment-reminder.lo ++liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attachment-reminder.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) ++DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/attachment-reminder/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/attachment-reminder/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-attachment-reminder.la: $(liborg_gnome_evolution_attachment_reminder_la_OBJECTS) $(liborg_gnome_evolution_attachment_reminder_la_DEPENDENCIES) +- $(liborg_gnome_evolution_attachment_reminder_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_attachment_reminder_la_OBJECTS) $(liborg_gnome_evolution_attachment_reminder_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_attachment_reminder_la_LDFLAGS) $(liborg_gnome_evolution_attachment_reminder_la_OBJECTS) $(liborg_gnome_evolution_attachment_reminder_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -501,83 +507,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attachment-reminder.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -586,7 +619,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -598,11 +630,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -625,23 +656,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -656,10 +692,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -681,7 +716,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -697,36 +732,25 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + +-install-data-am: install-data-local install-errorDATA \ +- install-pluginDATA install-pluginLTLIBRARIES \ +- install-schemaDATA +- +-install-dvi: install-dvi-am ++install-data-am: install-data-local install-errorDATA install-pluginDATA \ ++ install-pluginLTLIBRARIES install-schemaDATA + + 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 +@@ -747,26 +771,22 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA + +-.MAKE: install-am install-strip +- + .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-data-local install-dvi install-dvi-am \ +- install-errorDATA 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-ps install-ps-am \ +- install-schemaDATA 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-errorDATA uninstall-pluginDATA \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-errorDATA install-exec install-exec-am install-info \ ++ install-info-am install-man install-pluginDATA \ ++ install-pluginLTLIBRARIES install-schemaDATA 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-errorDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA + + +diff -ruN evolution-2.12.2.orig/plugins/audio-inline/Makefile.in evolution-2.12.2/plugins/audio-inline/Makefile.in +--- evolution-2.12.2.orig/plugins/audio-inline/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/audio-inline/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/audio-inline +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_audio_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am_liborg_gnome_audio_inline_la_OBJECTS = audio-inline.lo +-liborg_gnome_audio_inline_la_OBJECTS = \ +- $(am_liborg_gnome_audio_inline_la_OBJECTS) +-liborg_gnome_audio_inline_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_audio_inline_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,91 +384,98 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) \ + $(GSTREAMER_CFLAGS) + ++ + plugin_DATA = org-gnome-audio-inline.eplug + plugin_LTLIBRARIES = liborg-gnome-audio-inline.la ++ + liborg_gnome_audio_inline_la_SOURCES = audio-inline.c + liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version + liborg_gnome_audio_inline_la_LIBADD = $(GSTREAMER_LIBS) ++ + EXTRA_DIST = org-gnome-audio-inline.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/audio-inline ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_audio_inline_la_DEPENDENCIES = ++am_liborg_gnome_audio_inline_la_OBJECTS = audio-inline.lo ++liborg_gnome_audio_inline_la_OBJECTS = \ ++ $(am_liborg_gnome_audio_inline_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio-inline.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/audio-inline/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/audio-inline/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-audio-inline.la: $(liborg_gnome_audio_inline_la_OBJECTS) $(liborg_gnome_audio_inline_la_DEPENDENCIES) +- $(liborg_gnome_audio_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_audio_inline_la_OBJECTS) $(liborg_gnome_audio_inline_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_audio_inline_la_LDFLAGS) $(liborg_gnome_audio_inline_la_OBJECTS) $(liborg_gnome_audio_inline_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -479,49 +483,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio-inline.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -530,7 +559,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -542,11 +570,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -569,23 +596,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -600,10 +632,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -625,7 +656,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -640,34 +671,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -688,23 +709,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/backup-restore/Makefile.in evolution-2.12.2/plugins/backup-restore/Makefile.in +--- evolution-2.12.2.orig/plugins/backup-restore/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/backup-restore/Makefile.in 2007-12-05 15:54:57.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,70 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-privlibexec_PROGRAMS = evolution-backup$(EXEEXT) +-subdir = plugins/backup-restore +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" \ +- "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_backup_restore_la_LIBADD = +-am_liborg_gnome_backup_restore_la_OBJECTS = backup-restore.lo +-liborg_gnome_backup_restore_la_OBJECTS = \ +- $(am_liborg_gnome_backup_restore_la_OBJECTS) +-liborg_gnome_backup_restore_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_backup_restore_la_LDFLAGS) $(LDFLAGS) -o $@ +-privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(privlibexec_PROGRAMS) +-am_evolution_backup_OBJECTS = backup.$(OBJEXT) +-evolution_backup_OBJECTS = $(am_evolution_backup_OBJECTS) +-am__DEPENDENCIES_1 = +-evolution_backup_DEPENDENCIES = $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) \ +- $(evolution_backup_SOURCES) +-DIST_SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) \ +- $(evolution_backup_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -129,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -140,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -165,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -190,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -198,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -280,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -304,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -312,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -319,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -328,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -350,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -380,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -399,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ +@@ -416,97 +398,120 @@ + $(SHELL_CFLAGS) \ + $(E_UTIL_CFLAGS) + ++ + error_DATA = org-gnome-backup-restore.error + errordir = $(privdatadir)/errors ++ + plugin_DATA = org-gnome-backup-restore.eplug org-gnome-backup-restore.xml + plugin_LTLIBRARIES = liborg-gnome-backup-restore.la ++ + liborg_gnome_backup_restore_la_SOURCES = backup-restore.c + liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version ++ ++privlibexec_PROGRAMS = evolution-backup + evolution_backup_SOURCES = backup.c + evolution_backup_LDADD = $(SHELL_LIBS) ++ + EXTRA_DIST = \ + org-gnome-backup-restore.eplug.xml \ + org-gnome-backup-restore.error.xml \ + org-gnome-backup-restore.xml + ++ + BUILT_SOURCES = org-gnome-backup-restore.eplug \ + org-gnome-backup-restore.error + + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/backup-restore ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_backup_restore_la_LIBADD = ++am_liborg_gnome_backup_restore_la_OBJECTS = backup-restore.lo ++liborg_gnome_backup_restore_la_OBJECTS = \ ++ $(am_liborg_gnome_backup_restore_la_OBJECTS) ++privlibexec_PROGRAMS = evolution-backup$(EXEEXT) ++PROGRAMS = $(privlibexec_PROGRAMS) ++ ++am_evolution_backup_OBJECTS = backup.$(OBJEXT) ++evolution_backup_OBJECTS = $(am_evolution_backup_OBJECTS) ++evolution_backup_DEPENDENCIES = ++evolution_backup_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backup-restore.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/backup.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) \ ++ $(evolution_backup_SOURCES) ++DATA = $(error_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) $(evolution_backup_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/backup-restore/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/backup-restore/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-backup-restore.la: $(liborg_gnome_backup_restore_la_OBJECTS) $(liborg_gnome_backup_restore_la_DEPENDENCIES) +- $(liborg_gnome_backup_restore_la_LINK) -rpath $(plugindir) $(liborg_gnome_backup_restore_la_OBJECTS) $(liborg_gnome_backup_restore_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_backup_restore_la_LDFLAGS) $(liborg_gnome_backup_restore_la_OBJECTS) $(liborg_gnome_backup_restore_la_LIBADD) $(LIBS) ++privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -514,8 +519,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ + done + + clean-privlibexecPROGRAMS: +@@ -526,10 +531,10 @@ + done + evolution-backup$(EXEEXT): $(evolution_backup_OBJECTS) $(evolution_backup_DEPENDENCIES) + @rm -f evolution-backup$(EXEEXT) +- $(LINK) $(evolution_backup_OBJECTS) $(evolution_backup_LDADD) $(LIBS) ++ $(LINK) $(evolution_backup_LDFLAGS) $(evolution_backup_OBJECTS) $(evolution_backup_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -538,66 +543,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backup.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -606,7 +637,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -618,11 +648,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -645,23 +674,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -676,10 +710,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(privlibexecdir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -701,7 +734,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -716,14 +749,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -731,20 +762,12 @@ + install-data-am: install-errorDATA install-pluginDATA \ + install-pluginLTLIBRARIES + +-install-dvi: install-dvi-am +- + install-exec-am: install-privlibexecPROGRAMS + +-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 +@@ -765,28 +788,23 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-privlibexecPROGRAMS + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-pluginLTLIBRARIES \ +- clean-privlibexecPROGRAMS 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-errorDATA install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-pluginDATA \ ++ clean-libtool clean-pluginLTLIBRARIES clean-privlibexecPROGRAMS \ ++ ctags distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-errorDATA install-exec install-exec-am install-info \ ++ install-info-am install-man install-pluginDATA \ + install-pluginLTLIBRARIES install-privlibexecPROGRAMS \ +- install-ps install-ps-am 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-errorDATA \ +- uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ +- uninstall-privlibexecPROGRAMS ++ 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-errorDATA \ ++ uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES uninstall-privlibexecPROGRAMS + + + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/plugins/bbdb/Makefile.in evolution-2.12.2/plugins/bbdb/Makefile.in +--- evolution-2.12.2.orig/plugins/bbdb/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/bbdb/Makefile.in 2007-12-05 15:54:57.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/bbdb +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_evolution_bbdb_la_LIBADD = +-am_liborg_gnome_evolution_bbdb_la_OBJECTS = bbdb.lo gaimbuddies.lo +-liborg_gnome_evolution_bbdb_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_bbdb_la_OBJECTS) +-liborg_gnome_evolution_bbdb_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_bbdb_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_builddir)/composer \ +@@ -398,79 +393,89 @@ + $(EVOLUTION_MAIL_CFLAGS) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) + ++ + plugin_DATA = org-gnome-evolution-bbdb.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la ++ + liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c + liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/bbdb ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_bbdb_la_LIBADD = ++am_liborg_gnome_evolution_bbdb_la_OBJECTS = bbdb.lo gaimbuddies.lo ++liborg_gnome_evolution_bbdb_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_bbdb_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bbdb.Plo ./$(DEPDIR)/gaimbuddies.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/bbdb/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/bbdb/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-bbdb.la: $(liborg_gnome_evolution_bbdb_la_OBJECTS) $(liborg_gnome_evolution_bbdb_la_DEPENDENCIES) +- $(liborg_gnome_evolution_bbdb_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_bbdb_la_OBJECTS) $(liborg_gnome_evolution_bbdb_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_bbdb_la_LDFLAGS) $(liborg_gnome_evolution_bbdb_la_OBJECTS) $(liborg_gnome_evolution_bbdb_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -479,49 +484,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaimbuddies.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -530,7 +560,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -542,11 +571,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -569,23 +597,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -600,10 +633,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -625,7 +657,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -640,34 +672,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -688,23 +710,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/bogo-junk-plugin/Makefile.in evolution-2.12.2/plugins/bogo-junk-plugin/Makefile.in +--- evolution-2.12.2.orig/plugins/bogo-junk-plugin/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/bogo-junk-plugin/Makefile.in 2007-12-05 15:54:57.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,61 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/bogo-junk-plugin +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ +- "$(DESTDIR)$(schemadir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_bogo_junk_plugin_la_LIBADD = +-am_liborg_gnome_bogo_junk_plugin_la_OBJECTS = bf-junk-filter.lo +-liborg_gnome_bogo_junk_plugin_la_OBJECTS = \ +- $(am_liborg_gnome_bogo_junk_plugin_la_OBJECTS) +-liborg_gnome_bogo_junk_plugin_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_bogo_junk_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) $(schema_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -119,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -130,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -155,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -180,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -188,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -246,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -270,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -294,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -302,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -309,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -318,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -340,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -370,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -389,96 +384,106 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-bogo-junk-plugin.eplug + plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la ++ + liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c + liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = bogo-junk-plugin.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + BUILT_SOURCES = $(plugin_DATA) $(error_DATA) ++ + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++ + EXTRA_DIST = \ + org-gnome-bogo-junk-plugin.eplug.xml \ + $(schema_in_files) + ++subdir = plugins/bogo-junk-plugin ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_bogo_junk_plugin_la_LIBADD = ++am_liborg_gnome_bogo_junk_plugin_la_OBJECTS = bf-junk-filter.lo ++liborg_gnome_bogo_junk_plugin_la_OBJECTS = \ ++ $(am_liborg_gnome_bogo_junk_plugin_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bf-junk-filter.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) ++DATA = $(plugin_DATA) $(schema_DATA) ++ ++DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/bogo-junk-plugin/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/bogo-junk-plugin/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-bogo-junk-plugin.la: $(liborg_gnome_bogo_junk_plugin_la_OBJECTS) $(liborg_gnome_bogo_junk_plugin_la_DEPENDENCIES) +- $(liborg_gnome_bogo_junk_plugin_la_LINK) -rpath $(plugindir) $(liborg_gnome_bogo_junk_plugin_la_OBJECTS) $(liborg_gnome_bogo_junk_plugin_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_bogo_junk_plugin_la_LDFLAGS) $(liborg_gnome_bogo_junk_plugin_la_OBJECTS) $(liborg_gnome_bogo_junk_plugin_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -486,66 +491,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bf-junk-filter.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -554,7 +585,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,11 +596,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -593,23 +622,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -624,10 +658,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -649,7 +682,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -665,14 +698,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -680,20 +711,12 @@ + install-data-am: install-data-local install-pluginDATA \ + install-pluginLTLIBRARIES install-schemaDATA + +-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 +@@ -714,25 +737,21 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ +- uninstall-schemaDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES uninstall-schemaDATA + + .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-data-local 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-ps \ +- install-ps-am install-schemaDATA 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 \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-pluginDATA install-pluginLTLIBRARIES \ ++ install-schemaDATA 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-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA + + +diff -ruN evolution-2.12.2.orig/plugins/caldav/Makefile.in evolution-2.12.2/plugins/caldav/Makefile.in +--- evolution-2.12.2.orig/plugins/caldav/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/caldav/Makefile.in 2007-12-05 15:54:57.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/caldav +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_evolution_caldav_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am_liborg_gnome_evolution_caldav_la_OBJECTS = caldav-source.lo +-liborg_gnome_evolution_caldav_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_caldav_la_OBJECTS) +-liborg_gnome_evolution_caldav_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_caldav_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + $(EVOLUTION_CALENDAR_CFLAGS) \ +@@ -399,85 +393,97 @@ + -I$(top_srcdir) \ + -DCALDAV_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = org-gnome-evolution-caldav.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la ++ + liborg_gnome_evolution_caldav_la_SOURCES = \ + caldav-source.c + ++ + liborg_gnome_evolution_caldav_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EPLUGIN_LIBS) + ++ + liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + EXTRA_DIST = \ + org-gnome-evolution-caldav.eplug.xml + ++ + CLEANFILES = org-gnome-evolution-caldav.eplug ++subdir = plugins/caldav ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_caldav_la_DEPENDENCIES = ++am_liborg_gnome_evolution_caldav_la_OBJECTS = caldav-source.lo ++liborg_gnome_evolution_caldav_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_caldav_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/caldav-source.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/caldav/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/caldav/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-caldav.la: $(liborg_gnome_evolution_caldav_la_OBJECTS) $(liborg_gnome_evolution_caldav_la_DEPENDENCIES) +- $(liborg_gnome_evolution_caldav_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_caldav_la_OBJECTS) $(liborg_gnome_evolution_caldav_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_caldav_la_LDFLAGS) $(liborg_gnome_evolution_caldav_la_OBJECTS) $(liborg_gnome_evolution_caldav_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -485,49 +491,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caldav-source.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -536,7 +567,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -548,11 +578,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -575,23 +604,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -605,10 +639,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -629,7 +662,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -643,34 +676,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -691,23 +714,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/calendar-file/Makefile.in evolution-2.12.2/plugins/calendar-file/Makefile.in +--- evolution-2.12.2.orig/plugins/calendar-file/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/calendar-file/Makefile.in 2007-12-05 15:54:57.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/calendar-file +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_calendar_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am_liborg_gnome_calendar_file_la_OBJECTS = calendar-file.lo +-liborg_gnome_calendar_file_la_OBJECTS = \ +- $(am_liborg_gnome_calendar_file_la_OBJECTS) +-liborg_gnome_calendar_file_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_calendar_file_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,93 +384,100 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ + $(SOURCE_SEL_CFLAGS) + ++ + plugin_DATA = org-gnome-calendar-file.eplug + plugin_LTLIBRARIES = liborg-gnome-calendar-file.la ++ + liborg_gnome_calendar_file_la_SOURCES = calendar-file.c + liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_calendar_file_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + EXTRA_DIST = org-gnome-calendar-file.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/calendar-file ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_calendar_file_la_DEPENDENCIES = ++am_liborg_gnome_calendar_file_la_OBJECTS = calendar-file.lo ++liborg_gnome_calendar_file_la_OBJECTS = \ ++ $(am_liborg_gnome_calendar_file_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-file.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/calendar-file/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/calendar-file/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-calendar-file.la: $(liborg_gnome_calendar_file_la_OBJECTS) $(liborg_gnome_calendar_file_la_DEPENDENCIES) +- $(liborg_gnome_calendar_file_la_LINK) -rpath $(plugindir) $(liborg_gnome_calendar_file_la_OBJECTS) $(liborg_gnome_calendar_file_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_calendar_file_la_LDFLAGS) $(liborg_gnome_calendar_file_la_OBJECTS) $(liborg_gnome_calendar_file_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -481,49 +485,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-file.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -532,7 +561,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -544,11 +572,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -571,23 +598,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -602,10 +634,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -627,7 +658,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -642,34 +673,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -690,23 +711,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/calendar-http/Makefile.in evolution-2.12.2/plugins/calendar-http/Makefile.in +--- evolution-2.12.2.orig/plugins/calendar-http/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/calendar-http/Makefile.in 2007-12-05 15:54:57.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/calendar-http +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_calendar_http_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am_liborg_gnome_calendar_http_la_OBJECTS = calendar-http.lo +-liborg_gnome_calendar_http_la_OBJECTS = \ +- $(am_liborg_gnome_calendar_http_la_OBJECTS) +-liborg_gnome_calendar_http_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_calendar_http_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,93 +384,100 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ + $(SOURCE_SEL_CFLAGS) + ++ + plugin_DATA = org-gnome-calendar-http.eplug + plugin_LTLIBRARIES = liborg-gnome-calendar-http.la ++ + liborg_gnome_calendar_http_la_SOURCES = calendar-http.c + liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_calendar_http_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + EXTRA_DIST = org-gnome-calendar-http.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/calendar-http ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_calendar_http_la_DEPENDENCIES = ++am_liborg_gnome_calendar_http_la_OBJECTS = calendar-http.lo ++liborg_gnome_calendar_http_la_OBJECTS = \ ++ $(am_liborg_gnome_calendar_http_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-http.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/calendar-http/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/calendar-http/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-calendar-http.la: $(liborg_gnome_calendar_http_la_OBJECTS) $(liborg_gnome_calendar_http_la_DEPENDENCIES) +- $(liborg_gnome_calendar_http_la_LINK) -rpath $(plugindir) $(liborg_gnome_calendar_http_la_OBJECTS) $(liborg_gnome_calendar_http_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_calendar_http_la_LDFLAGS) $(liborg_gnome_calendar_http_la_OBJECTS) $(liborg_gnome_calendar_http_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -481,49 +485,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-http.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -532,7 +561,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -544,11 +572,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -571,23 +598,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -602,10 +634,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -627,7 +658,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -642,34 +673,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -690,23 +711,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/calendar-weather/Makefile.in evolution-2.12.2/plugins/calendar-weather/Makefile.in +--- evolution-2.12.2.orig/plugins/calendar-weather/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/calendar-weather/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,63 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/calendar-weather +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ +- "$(DESTDIR)$(weatherdatadir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_calendar_weather_la_DEPENDENCIES = \ +- $(top_builddir)/calendar/gui/libevolution-calendar.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_calendar_weather_la_OBJECTS = calendar-weather.lo +-liborg_gnome_calendar_weather_la_OBJECTS = \ +- $(am_liborg_gnome_calendar_weather_la_OBJECTS) +-liborg_gnome_calendar_weather_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_calendar_weather_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-weatherdataDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) $(weatherdata_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -121,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -132,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -157,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -182,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -190,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -248,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -272,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -296,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -304,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -311,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -320,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -342,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -372,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -391,14 +384,12 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` + weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/shell \ +@@ -407,6 +398,7 @@ + -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ + -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" + ++ + weatherdata_DATA = \ + category_weather_cloudy_16.png \ + category_weather_fog_16.png \ +@@ -416,86 +408,97 @@ + category_weather_sun_16.png \ + category_weather_tstorm_16.png + ++ + plugin_DATA = org-gnome-calendar-weather.eplug + plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la ++ + liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c + liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_calendar_weather_la_LIBADD = \ + $(top_builddir)/calendar/gui/libevolution-calendar.la \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + EXTRA_DIST = \ + org-gnome-calendar-weather.eplug.xml \ + $(weatherdata_DATA) + ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/calendar-weather ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_calendar_weather_la_DEPENDENCIES = \ ++ $(top_builddir)/calendar/gui/libevolution-calendar.la ++am_liborg_gnome_calendar_weather_la_OBJECTS = calendar-weather.lo ++liborg_gnome_calendar_weather_la_OBJECTS = \ ++ $(am_liborg_gnome_calendar_weather_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-weather.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) ++DATA = $(plugin_DATA) $(weatherdata_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/calendar-weather/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/calendar-weather/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-calendar-weather.la: $(liborg_gnome_calendar_weather_la_OBJECTS) $(liborg_gnome_calendar_weather_la_DEPENDENCIES) +- $(liborg_gnome_calendar_weather_la_LINK) -rpath $(plugindir) $(liborg_gnome_calendar_weather_la_OBJECTS) $(liborg_gnome_calendar_weather_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_calendar_weather_la_LDFLAGS) $(liborg_gnome_calendar_weather_la_OBJECTS) $(liborg_gnome_calendar_weather_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -503,66 +506,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-weather.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done ++weatherdataDATA_INSTALL = $(INSTALL_DATA) + install-weatherdataDATA: $(weatherdata_DATA) + @$(NORMAL_INSTALL) +- test -z "$(weatherdatadir)" || $(MKDIR_P) "$(DESTDIR)$(weatherdatadir)" ++ $(mkinstalldirs) $(DESTDIR)$(weatherdatadir) + @list='$(weatherdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(weatherdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(weatherdatadir)/$$f'"; \ +- $(weatherdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(weatherdatadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(weatherdataDATA_INSTALL) $$d$$p $(DESTDIR)$(weatherdatadir)/$$f"; \ ++ $(weatherdataDATA_INSTALL) $$d$$p $(DESTDIR)$(weatherdatadir)/$$f; \ + done + + uninstall-weatherdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(weatherdata_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(weatherdatadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(weatherdatadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(weatherdatadir)/$$f"; \ ++ rm -f $(DESTDIR)$(weatherdatadir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -571,7 +600,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -583,11 +611,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -610,23 +637,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -641,10 +673,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(weatherdatadir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) $(DESTDIR)$(weatherdatadir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -666,7 +697,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -681,14 +712,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -696,20 +725,12 @@ + install-data-am: install-pluginDATA install-pluginLTLIBRARIES \ + install-weatherdataDATA + +-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 +@@ -730,25 +751,21 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ +- uninstall-weatherdataDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES uninstall-weatherdataDATA + + .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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- install-strip install-weatherdataDATA 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA install-pluginLTLIBRARIES install-strip \ ++ install-weatherdataDATA 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-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-weatherdataDATA + + +diff -ruN evolution-2.12.2.orig/plugins/copy-tool/Makefile.in evolution-2.12.2/plugins/copy-tool/Makefile.in +--- evolution-2.12.2.orig/plugins/copy-tool/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/copy-tool/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/copy-tool +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_copy_tool_la_LIBADD = +-am_liborg_gnome_copy_tool_la_OBJECTS = copy-tool.lo +-liborg_gnome_copy_tool_la_OBJECTS = \ +- $(am_liborg_gnome_copy_tool_la_OBJECTS) +-liborg_gnome_copy_tool_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_copy_tool_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,89 +384,96 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-copy-tool.eplug + plugin_LTLIBRARIES = liborg-gnome-copy-tool.la ++ + liborg_gnome_copy_tool_la_SOURCES = copy-tool.c + liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-copy-tool.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/copy-tool ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_copy_tool_la_LIBADD = ++am_liborg_gnome_copy_tool_la_OBJECTS = copy-tool.lo ++liborg_gnome_copy_tool_la_OBJECTS = \ ++ $(am_liborg_gnome_copy_tool_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/copy-tool.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/copy-tool/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/copy-tool/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-copy-tool.la: $(liborg_gnome_copy_tool_la_OBJECTS) $(liborg_gnome_copy_tool_la_DEPENDENCIES) +- $(liborg_gnome_copy_tool_la_LINK) -rpath $(plugindir) $(liborg_gnome_copy_tool_la_OBJECTS) $(liborg_gnome_copy_tool_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_copy_tool_la_LDFLAGS) $(liborg_gnome_copy_tool_la_OBJECTS) $(liborg_gnome_copy_tool_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -476,49 +481,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy-tool.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -527,7 +557,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,11 +568,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,23 +594,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +630,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -622,7 +654,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +669,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -685,23 +707,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/default-mailer/Makefile.in evolution-2.12.2/plugins/default-mailer/Makefile.in +--- evolution-2.12.2.orig/plugins/default-mailer/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/default-mailer/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,61 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/default-mailer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_default_mailer_la_LIBADD = +-am_liborg_gnome_default_mailer_la_OBJECTS = default-mailer.lo +-liborg_gnome_default_mailer_la_OBJECTS = \ +- $(am_liborg_gnome_default_mailer_la_OBJECTS) +-liborg_gnome_default_mailer_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_default_mailer_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -119,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -130,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -155,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -180,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -188,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -246,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -270,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -294,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -302,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -309,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -318,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -340,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -370,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -389,102 +384,113 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/shell \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + error_DATA = org-gnome-default-mailer.error + errordir = $(privdatadir)/errors ++ + plugin_DATA = org-gnome-default-mailer.eplug + plugin_LTLIBRARIES = liborg-gnome-default-mailer.la ++ + liborg_gnome_default_mailer_la_SOURCES = default-mailer.c + liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version ++ + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + EXTRA_DIST = \ + org-gnome-default-mailer.eplug.xml \ + org-gnome-default-mailer.error.xml \ + $(schema_in_files) + ++ + BUILT_SOURCES = org-gnome-default-mailer.eplug \ + org-gnome-default-mailer.error + ++ + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++subdir = plugins/default-mailer ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_default_mailer_la_LIBADD = ++am_liborg_gnome_default_mailer_la_OBJECTS = default-mailer.lo ++liborg_gnome_default_mailer_la_OBJECTS = \ ++ $(am_liborg_gnome_default_mailer_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/default-mailer.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) ++DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/default-mailer/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/default-mailer/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-default-mailer.la: $(liborg_gnome_default_mailer_la_OBJECTS) $(liborg_gnome_default_mailer_la_DEPENDENCIES) +- $(liborg_gnome_default_mailer_la_LINK) -rpath $(plugindir) $(liborg_gnome_default_mailer_la_OBJECTS) $(liborg_gnome_default_mailer_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_default_mailer_la_LDFLAGS) $(liborg_gnome_default_mailer_la_OBJECTS) $(liborg_gnome_default_mailer_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -492,83 +498,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default-mailer.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -577,7 +610,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -589,11 +621,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -616,23 +647,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -647,10 +683,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -672,7 +707,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -688,36 +723,25 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + +-install-data-am: install-data-local install-errorDATA \ +- install-pluginDATA install-pluginLTLIBRARIES \ +- install-schemaDATA +- +-install-dvi: install-dvi-am ++install-data-am: install-data-local install-errorDATA install-pluginDATA \ ++ install-pluginLTLIBRARIES install-schemaDATA + + 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 +@@ -738,26 +762,22 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA + +-.MAKE: install-am install-strip +- + .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-data-local install-dvi install-dvi-am \ +- install-errorDATA 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-ps install-ps-am \ +- install-schemaDATA 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-errorDATA uninstall-pluginDATA \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-errorDATA install-exec install-exec-am install-info \ ++ install-info-am install-man install-pluginDATA \ ++ install-pluginLTLIBRARIES install-schemaDATA 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-errorDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA + + +diff -ruN evolution-2.12.2.orig/plugins/default-source/Makefile.in evolution-2.12.2/plugins/default-source/Makefile.in +--- evolution-2.12.2.orig/plugins/default-source/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/default-source/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/default-source +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_default_source_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_default_source_la_OBJECTS = default-source.lo +-liborg_gnome_default_source_la_OBJECTS = \ +- $(am_liborg_gnome_default_source_la_OBJECTS) +-liborg_gnome_default_source_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_default_source_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_default_source_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_default_source_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -400,83 +393,93 @@ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(SOURCE_SEL_CFLAGS) + ++ + plugin_DATA = org-gnome-default-source.eplug + plugin_LTLIBRARIES = liborg-gnome-default-source.la ++ + liborg_gnome_default_source_la_SOURCES = default-source.c + liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_default_source_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + ++ + EXTRA_DIST = org-gnome-default-source.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/default-source ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_default_source_la_DEPENDENCIES = ++am_liborg_gnome_default_source_la_OBJECTS = default-source.lo ++liborg_gnome_default_source_la_OBJECTS = \ ++ $(am_liborg_gnome_default_source_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/default-source.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_default_source_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_default_source_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/default-source/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/default-source/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-default-source.la: $(liborg_gnome_default_source_la_OBJECTS) $(liborg_gnome_default_source_la_DEPENDENCIES) +- $(liborg_gnome_default_source_la_LINK) -rpath $(plugindir) $(liborg_gnome_default_source_la_OBJECTS) $(liborg_gnome_default_source_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_default_source_la_LDFLAGS) $(liborg_gnome_default_source_la_OBJECTS) $(liborg_gnome_default_source_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -484,49 +487,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default-source.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -535,7 +563,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -547,11 +574,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -574,23 +600,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -605,10 +636,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -630,7 +660,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -645,34 +675,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -693,23 +713,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/exchange-operations/Makefile.in evolution-2.12.2/plugins/exchange-operations/Makefile.in +--- evolution-2.12.2.orig/plugins/exchange-operations/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/exchange-operations/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,77 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/exchange-operations +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_exchange_operations_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/calendar/gui/libevolution-calendar.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_exchange_operations_la_OBJECTS = \ +- exchange-operations.lo exchange-config-listener.lo \ +- exchange-calendar.lo exchange-contacts.lo \ +- exchange-change-password.lo exchange-delegates-user.lo \ +- exchange-delegates.lo exchange-user-dialog.lo \ +- exchange-folder-size-display.lo exchange-account-setup.lo \ +- exchange-permissions-dialog.lo exchange-folder-permission.lo \ +- exchange-folder-subscription.lo exchange-folder.lo \ +- exchange-mail-send-options.lo exchange-send-options.lo +-liborg_gnome_exchange_operations_la_OBJECTS = \ +- $(am_liborg_gnome_exchange_operations_la_OBJECTS) +-liborg_gnome_exchange_operations_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_exchange_operations_la_LDFLAGS) $(LDFLAGS) -o \ +- $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -135,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -146,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -171,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -196,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -204,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -262,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -286,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -310,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -318,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -325,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -334,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -356,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -386,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -405,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = -I . \ + -I$(top_srcdir) \ +@@ -421,6 +397,7 @@ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = org-gnome-exchange-operations.eplug \ + org-gnome-folder-permissions.xml \ + org-gnome-folder-subscription.xml \ +@@ -428,7 +405,9 @@ + org-gnome-exchange-cal-subscription.xml \ + org-gnome-exchange-ab-subscription.xml + ++ + plugin_LTLIBRARIES = liborg-gnome-exchange-operations.la ++ + liborg_gnome_exchange_operations_la_SOURCES = \ + exchange-operations.c \ + exchange-operations.h \ +@@ -457,6 +436,7 @@ + exchange-send-options.c \ + exchange-send-options.h + ++ + liborg_gnome_exchange_operations_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ +@@ -465,7 +445,9 @@ + $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ + $(CAMEL_EXCHANGE_LIBS) + ++ + liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + glade_DATA = \ + exchange-change-password.glade \ + exchange-delegates.glade \ +@@ -476,8 +458,10 @@ + exchange-oof.glade \ + exchange-send-options.glade + ++ + error_DATA = org-gnome-exchange-operations.error + errordir = $(privdatadir)/errors ++ + EXTRA_DIST = \ + org-gnome-exchange-operations.eplug.xml \ + org-gnome-exchange-operations.error.xml \ +@@ -488,74 +472,110 @@ + org-gnome-exchange-ab-subscription.xml \ + $(glade_DATA) + ++ + BUILT_SOURCES = $(error_DATA) org-gnome-exchange-operations.eplug ++ + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/exchange-operations ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_exchange_operations_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/calendar/gui/libevolution-calendar.la \ ++ $(top_builddir)/mail/libevolution-mail.la \ ++ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la ++am_liborg_gnome_exchange_operations_la_OBJECTS = exchange-operations.lo \ ++ exchange-config-listener.lo exchange-calendar.lo \ ++ exchange-contacts.lo exchange-change-password.lo \ ++ exchange-delegates-user.lo exchange-delegates.lo \ ++ exchange-user-dialog.lo exchange-folder-size-display.lo \ ++ exchange-account-setup.lo exchange-permissions-dialog.lo \ ++ exchange-folder-permission.lo exchange-folder-subscription.lo \ ++ exchange-folder.lo exchange-mail-send-options.lo \ ++ exchange-send-options.lo ++liborg_gnome_exchange_operations_la_OBJECTS = \ ++ $(am_liborg_gnome_exchange_operations_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/exchange-account-setup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-change-password.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-config-listener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-contacts.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-delegates-user.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-delegates.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder-permission.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder-size-display.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder-subscription.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-mail-send-options.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-operations.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-permissions-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-send-options.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/exchange-user-dialog.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) ++DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/exchange-operations/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/exchange-operations/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-exchange-operations.la: $(liborg_gnome_exchange_operations_la_OBJECTS) $(liborg_gnome_exchange_operations_la_DEPENDENCIES) +- $(liborg_gnome_exchange_operations_la_LINK) -rpath $(plugindir) $(liborg_gnome_exchange_operations_la_OBJECTS) $(liborg_gnome_exchange_operations_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_exchange_operations_la_LDFLAGS) $(liborg_gnome_exchange_operations_la_OBJECTS) $(liborg_gnome_exchange_operations_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -578,83 +598,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exchange-user-dialog.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -663,7 +710,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -675,11 +721,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -702,23 +747,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -733,10 +783,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -758,7 +807,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -773,35 +822,25 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + +-install-data-am: install-errorDATA install-gladeDATA \ +- install-pluginDATA install-pluginLTLIBRARIES +- +-install-dvi: install-dvi-am ++install-data-am: install-errorDATA install-gladeDATA install-pluginDATA \ ++ install-pluginLTLIBRARIES + + 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 +@@ -822,26 +861,23 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-gladeDATA \ ++uninstall-am: uninstall-errorDATA uninstall-gladeDATA uninstall-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-errorDATA install-exec install-exec-am \ +- install-gladeDATA install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-pluginDATA install-pluginLTLIBRARIES install-ps \ +- install-ps-am 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-errorDATA uninstall-gladeDATA \ +- uninstall-pluginDATA uninstall-pluginLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-gladeDATA install-info \ ++ install-info-am install-man install-pluginDATA \ ++ 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-errorDATA \ ++ uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES + + + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/plugins/face/Makefile.in evolution-2.12.2/plugins/face/Makefile.in +--- evolution-2.12.2.orig/plugins/face/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/face/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,63 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/face +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_face_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_face_la_OBJECTS = face.lo +-liborg_gnome_face_la_OBJECTS = $(am_liborg_gnome_face_la_OBJECTS) +-liborg_gnome_face_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_face_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_face_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_face_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -121,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -132,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -157,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -182,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -190,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -248,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -272,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -296,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -304,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -311,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -320,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -342,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -372,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -391,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = -I. \ + -I$(top_srcdir) \ +@@ -408,11 +398,14 @@ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = \ + org-gnome-face.eplug \ + org-gnome-face-ui.xml + ++ + plugin_LTLIBRARIES = liborg-gnome-face.la ++ + liborg_gnome_face_la_SOURCES = \ + face.c + +@@ -423,87 +416,100 @@ + $(EVOLUTION_MAIL_LIBS) \ + $(NO_UNDEFINED_REQUIRED_LIBS) + ++ + liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + error_DATA = \ + org-gnome-face.errors.xml + ++ + errordir = $(privdatadir)/errors ++ + EXTRA_DIST = \ + org-gnome-face.eplug.xml \ + org-gnome-face-ui.xml \ + $(error_DATA) + ++ + BUILT_SOURCES = \ + org-gnome-face.eplug \ + $(error_i18n) + ++ + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/face ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_face_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_liborg_gnome_face_la_OBJECTS = face.lo ++liborg_gnome_face_la_OBJECTS = $(am_liborg_gnome_face_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/face.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_face_la_SOURCES) ++DATA = $(error_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_face_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/face/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/face/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-face.la: $(liborg_gnome_face_la_OBJECTS) $(liborg_gnome_face_la_DEPENDENCIES) +- $(liborg_gnome_face_la_LINK) -rpath $(plugindir) $(liborg_gnome_face_la_OBJECTS) $(liborg_gnome_face_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_face_la_LDFLAGS) $(liborg_gnome_face_la_OBJECTS) $(liborg_gnome_face_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -511,66 +517,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/face.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -579,7 +611,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -591,11 +622,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -618,23 +648,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -649,10 +684,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -674,7 +708,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -689,14 +723,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -704,20 +736,12 @@ + install-data-am: install-errorDATA install-pluginDATA \ + 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 +@@ -738,25 +762,21 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-errorDATA 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-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-pluginDATA 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-errorDATA uninstall-pluginDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/folder-unsubscribe/Makefile.in evolution-2.12.2/plugins/folder-unsubscribe/Makefile.in +--- evolution-2.12.2.orig/plugins/folder-unsubscribe/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/plugins/folder-unsubscribe/Makefile.in 2007-12-05 15:54:58.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/folder-unsubscribe +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_mail_folder_unsubscribe_la_LIBADD = +-am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ +- folder-unsubscribe.lo +-liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ +- $(am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) +-liborg_gnome_mail_folder_unsubscribe_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS) $(LDFLAGS) \ +- -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,86 +384,93 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-mail-folder-unsubscribe.eplug + plugin_LTLIBRARIES = liborg-gnome-mail-folder-unsubscribe.la ++ + liborg_gnome_mail_folder_unsubscribe_la_SOURCES = folder-unsubscribe.c + liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml ++subdir = plugins/folder-unsubscribe ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mail_folder_unsubscribe_la_LIBADD = ++am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ ++ folder-unsubscribe.lo ++liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ ++ $(am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/folder-unsubscribe.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/folder-unsubscribe/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/folder-unsubscribe/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mail-folder-unsubscribe.la: $(liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) $(liborg_gnome_mail_folder_unsubscribe_la_DEPENDENCIES) +- $(liborg_gnome_mail_folder_unsubscribe_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) $(liborg_gnome_mail_folder_unsubscribe_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS) $(liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) $(liborg_gnome_mail_folder_unsubscribe_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -475,49 +478,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/folder-unsubscribe.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -526,7 +554,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -538,11 +565,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -565,23 +591,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -595,10 +626,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -618,7 +648,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -632,34 +662,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -680,23 +700,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/groupwise-account-setup/Makefile.in evolution-2.12.2/plugins/groupwise-account-setup/Makefile.in +--- evolution-2.12.2.orig/plugins/groupwise-account-setup/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/groupwise-account-setup/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,64 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/groupwise-account-setup +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_gw_account_setup_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_liborg_gnome_gw_account_setup_la_OBJECTS = camel-gw-listener.lo \ +- groupwise-account-setup.lo +-liborg_gnome_gw_account_setup_la_OBJECTS = \ +- $(am_liborg_gnome_gw_account_setup_la_OBJECTS) +-liborg_gnome_gw_account_setup_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_gw_account_setup_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -122,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -133,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -158,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -183,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -191,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -249,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -273,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -297,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -305,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -312,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -321,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -343,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -373,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -392,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -406,14 +395,18 @@ + $(CAMEL_GROUPWISE_CFLAGS) \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = org-gnome-gw-account-setup.eplug + plugin_LTLIBRARIES = liborg-gnome-gw-account-setup.la ++ + liborg_gnome_gw_account_setup_la_SOURCES = \ + camel-gw-listener.c \ + camel-gw-listener.h \ + groupwise-account-setup.c + ++ + liborg_gnome_gw_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + liborg_gnome_gw_account_setup_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ +@@ -422,75 +415,88 @@ + $(EVOLUTION_MAIL_LIBS) \ + $(CAMEL_GROUPWISE_LIBS) + ++ + EXTRA_DIST = org-gnome-gw-account-setup.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/groupwise-account-setup ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_gw_account_setup_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/filter/libfilter.la ++am_liborg_gnome_gw_account_setup_la_OBJECTS = camel-gw-listener.lo \ ++ groupwise-account-setup.lo ++liborg_gnome_gw_account_setup_la_OBJECTS = \ ++ $(am_liborg_gnome_gw_account_setup_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/camel-gw-listener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/groupwise-account-setup.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/groupwise-account-setup/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/groupwise-account-setup/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-gw-account-setup.la: $(liborg_gnome_gw_account_setup_la_OBJECTS) $(liborg_gnome_gw_account_setup_la_DEPENDENCIES) +- $(liborg_gnome_gw_account_setup_la_LINK) -rpath $(plugindir) $(liborg_gnome_gw_account_setup_la_OBJECTS) $(liborg_gnome_gw_account_setup_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_gw_account_setup_la_LDFLAGS) $(liborg_gnome_gw_account_setup_la_OBJECTS) $(liborg_gnome_gw_account_setup_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -499,49 +505,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupwise-account-setup.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -550,7 +581,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -562,11 +592,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -589,23 +618,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -620,10 +654,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -645,7 +678,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -660,34 +693,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -708,23 +731,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/groupwise-features/Makefile.in evolution-2.12.2/plugins/groupwise-features/Makefile.in +--- evolution-2.12.2.orig/plugins/groupwise-features/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/groupwise-features/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,73 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/groupwise-features +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_groupwise_features_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/calendar/gui/libevolution-calendar.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/filter/libfilter.la \ +- $(NO_UNDEFINED_REQUIRED_LIBS) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_liborg_gnome_groupwise_features_la_OBJECTS = \ +- share-folder-common.lo share-folder.lo install-shared.lo \ +- send-options.lo mail-send-options.lo status-track.lo \ +- addressbook-groupwise.lo junk-mail-settings.lo \ +- junk-settings.lo proxy.lo proxy-login.lo process-meeting.lo \ +- mail-retract.lo +-liborg_gnome_groupwise_features_la_OBJECTS = \ +- $(am_liborg_gnome_groupwise_features_la_OBJECTS) +-liborg_gnome_groupwise_features_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_groupwise_features_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -131,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -142,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -167,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -192,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -200,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -258,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -282,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -306,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -314,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -321,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -330,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -352,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -382,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -401,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +@@ -422,8 +403,10 @@ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" + ++ + plugin_DATA = org-gnome-groupwise-features.eplug org-gnome-compose-send-options.xml + plugin_LTLIBRARIES = liborg-gnome-groupwise-features.la ++ + liborg_gnome_groupwise_features_la_SOURCES = \ + share-folder-common.c \ + share-folder.c \ +@@ -444,6 +427,7 @@ + process-meeting.c \ + mail-retract.c + ++ + liborg_gnome_groupwise_features_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/calendar/gui/libevolution-calendar.la \ +@@ -454,7 +438,9 @@ + $(EVOLUTION_MAIL_LIBS) \ + $(CAMEL_GROUPWISE_LIBS) + ++ + liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + glade_DATA = \ + properties.glade \ + junk-settings.glade \ +@@ -462,14 +448,18 @@ + proxy-listing.glade \ + proxy-login-dialog.glade + ++ + error_DATA = \ + org-gnome-shared-folder.errors.xml \ + org-gnome-proxy-errors.xml \ + org-gnome-proxy-login-errors.xml \ + org-gnome-mail-retract-errors.xml + ++ + errordir = $(privdatadir)/errors ++ + BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_i18n) ++ + EXTRA_DIST = \ + $(error_DATA) \ + $(glade_DATA) \ +@@ -478,73 +468,105 @@ + org-gnome-proxy-login-errors.xml \ + org-gnome-mail-retract-errors.xml + ++ + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/groupwise-features ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@liborg_gnome_groupwise_features_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/calendar/gui/libevolution-calendar.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/filter/libfilter.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/mail/libevolution-mail.la ++@OS_WIN32_FALSE@liborg_gnome_groupwise_features_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/calendar/gui/libevolution-calendar.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/filter/libfilter.la ++am_liborg_gnome_groupwise_features_la_OBJECTS = share-folder-common.lo \ ++ share-folder.lo install-shared.lo send-options.lo \ ++ mail-send-options.lo status-track.lo addressbook-groupwise.lo \ ++ junk-mail-settings.lo junk-settings.lo proxy.lo proxy-login.lo \ ++ process-meeting.lo mail-retract.lo ++liborg_gnome_groupwise_features_la_OBJECTS = \ ++ $(am_liborg_gnome_groupwise_features_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addressbook-groupwise.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/install-shared.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/junk-mail-settings.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/junk-settings.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-retract.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-send-options.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/process-meeting.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/proxy-login.Plo ./$(DEPDIR)/proxy.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/send-options.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/share-folder-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/share-folder.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/status-track.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) ++DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/groupwise-features/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/groupwise-features/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-groupwise-features.la: $(liborg_gnome_groupwise_features_la_OBJECTS) $(liborg_gnome_groupwise_features_la_DEPENDENCIES) +- $(liborg_gnome_groupwise_features_la_LINK) -rpath $(plugindir) $(liborg_gnome_groupwise_features_la_OBJECTS) $(liborg_gnome_groupwise_features_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_groupwise_features_la_LDFLAGS) $(liborg_gnome_groupwise_features_la_OBJECTS) $(liborg_gnome_groupwise_features_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -564,83 +586,110 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/status-track.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -649,7 +698,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -661,11 +709,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -688,23 +735,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -719,10 +771,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -744,7 +795,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -759,35 +810,25 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + +-install-data-am: install-errorDATA install-gladeDATA \ +- install-pluginDATA install-pluginLTLIBRARIES +- +-install-dvi: install-dvi-am ++install-data-am: install-errorDATA install-gladeDATA install-pluginDATA \ ++ install-pluginLTLIBRARIES + + 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 +@@ -808,26 +849,23 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-gladeDATA \ ++uninstall-am: uninstall-errorDATA uninstall-gladeDATA uninstall-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-errorDATA install-exec install-exec-am \ +- install-gladeDATA install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-pluginDATA install-pluginLTLIBRARIES install-ps \ +- install-ps-am 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-errorDATA uninstall-gladeDATA \ +- uninstall-pluginDATA uninstall-pluginLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-gladeDATA install-info \ ++ install-info-am install-man install-pluginDATA \ ++ 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-errorDATA \ ++ uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES + + + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/plugins/hula-account-setup/Makefile.in evolution-2.12.2/plugins/hula-account-setup/Makefile.in +--- evolution-2.12.2.orig/plugins/hula-account-setup/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/hula-account-setup/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,66 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/hula-account-setup +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_evolution_hula_account_setup_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ +- camel-hula-listener.lo hula-account-setup.lo +-liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS) +-liborg_gnome_evolution_hula_account_setup_la_LINK = $(LIBTOOL) \ +- --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ +- $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_hula_account_setup_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) +-DIST_SOURCES = \ +- $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -124,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -135,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -160,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -185,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -193,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -251,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -275,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -299,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -307,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -314,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -323,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -345,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -375,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -394,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -406,14 +393,18 @@ + $(EVOLUTION_CALENDAR_CFLAGS) \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = org-gnome-evolution-hula-account-setup.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la ++ + liborg_gnome_evolution_hula_account_setup_la_SOURCES = \ + camel-hula-listener.c \ + camel-hula-listener.h \ + hula-account-setup.c + ++ + liborg_gnome_evolution_hula_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + liborg_gnome_evolution_hula_account_setup_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ +@@ -421,75 +412,88 @@ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) + ++ + EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/hula-account-setup ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_hula_account_setup_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/filter/libfilter.la ++am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ ++ camel-hula-listener.lo hula-account-setup.lo ++liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/camel-hula-listener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/hula-account-setup.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/hula-account-setup/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/hula-account-setup/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-hula-account-setup.la: $(liborg_gnome_evolution_hula_account_setup_la_OBJECTS) $(liborg_gnome_evolution_hula_account_setup_la_DEPENDENCIES) +- $(liborg_gnome_evolution_hula_account_setup_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_hula_account_setup_la_OBJECTS) $(liborg_gnome_evolution_hula_account_setup_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_hula_account_setup_la_LDFLAGS) $(liborg_gnome_evolution_hula_account_setup_la_OBJECTS) $(liborg_gnome_evolution_hula_account_setup_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -498,49 +502,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hula-account-setup.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -549,7 +578,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -561,11 +589,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -588,23 +615,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -619,10 +651,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -644,7 +675,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -659,34 +690,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -707,23 +728,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/imap-features/Makefile.in evolution-2.12.2/plugins/imap-features/Makefile.in +--- evolution-2.12.2.orig/plugins/imap-features/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/imap-features/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/imap-features +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_imap_features_la_DEPENDENCIES = \ +- $(NO_UNDEFINED_REQUIRED_LIBS) $(am__DEPENDENCIES_1) +-am_liborg_gnome_imap_features_la_OBJECTS = imap-headers.lo +-liborg_gnome_imap_features_la_OBJECTS = \ +- $(am_liborg_gnome_imap_features_la_OBJECTS) +-liborg_gnome_imap_features_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_imap_features_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_imap_features_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_imap_features_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/mail \ +@@ -406,92 +398,109 @@ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" + ++ + plugin_DATA = org-gnome-imap-features.eplug + plugin_LTLIBRARIES = liborg-gnome-imap-features.la ++ + liborg_gnome_imap_features_la_SOURCES = \ + imap-headers.c + ++ + liborg_gnome_imap_features_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) \ + $(EVOLUTION_MAIL_LIBS) + ++ + liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + glade_DATA = \ + imap-headers.glade + ++ + errordir = $(privdatadir)/errors ++ + BUILT_SOURCES = org-gnome-imap-features.eplug $(error_i18n) ++ + EXTRA_DIST = \ + $(glade_DATA) \ + org-gnome-imap-features.eplug.xml + ++ + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/imap-features ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@liborg_gnome_imap_features_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/mail/libevolution-mail.la ++@OS_WIN32_FALSE@liborg_gnome_imap_features_la_DEPENDENCIES = ++am_liborg_gnome_imap_features_la_OBJECTS = imap-headers.lo ++liborg_gnome_imap_features_la_OBJECTS = \ ++ $(am_liborg_gnome_imap_features_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/imap-headers.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_imap_features_la_SOURCES) ++DATA = $(glade_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_imap_features_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/imap-features/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/imap-features/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-imap-features.la: $(liborg_gnome_imap_features_la_OBJECTS) $(liborg_gnome_imap_features_la_DEPENDENCIES) +- $(liborg_gnome_imap_features_la_LINK) -rpath $(plugindir) $(liborg_gnome_imap_features_la_OBJECTS) $(liborg_gnome_imap_features_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_imap_features_la_LDFLAGS) $(liborg_gnome_imap_features_la_OBJECTS) $(liborg_gnome_imap_features_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -499,66 +508,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap-headers.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -567,7 +602,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -579,11 +613,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -606,23 +639,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -637,10 +675,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -662,7 +699,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -677,14 +714,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -692,20 +727,12 @@ + install-data-am: install-gladeDATA install-pluginDATA \ + 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 +@@ -726,25 +753,21 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-pluginDATA 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-gladeDATA uninstall-pluginDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-gladeDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/import-ics-attachments/Makefile.in evolution-2.12.2/plugins/import-ics-attachments/Makefile.in +--- evolution-2.12.2.orig/plugins/import-ics-attachments/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/import-ics-attachments/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,63 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/import-ics-attachments +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \ +- icsimporter.lo +-liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = $(am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) +-liborg_gnome_evolution_mail_attachments_import_ics_la_LINK = \ +- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -121,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -132,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -157,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -182,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -190,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -248,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -272,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -296,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -304,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -311,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -320,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -342,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -372,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -391,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)\ +@@ -413,8 +403,10 @@ + -DPLUGINDIR=\""$(plugindir)"\" \ + -DPREFIX=\""$(prefix)"\" + ++ + plugin_DATA = org-gnome-evolution-mail-attachments-import-ics.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-mail-attachments-import-ics.la ++ + liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES = icsimporter.c + liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ +@@ -422,75 +414,87 @@ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) + ++ + EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/import-ics-attachments ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \ ++ icsimporter.lo ++liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/icsimporter.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = \ ++ $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/import-ics-attachments/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/import-ics-attachments/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-mail-attachments-import-ics.la: $(liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES) +- $(liborg_gnome_evolution_mail_attachments_import_ics_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -498,49 +502,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icsimporter.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -549,7 +578,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -561,11 +589,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -588,23 +615,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -619,10 +651,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -644,7 +675,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -659,34 +690,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -707,23 +728,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/ipod-sync/Makefile.in evolution-2.12.2/plugins/ipod-sync/Makefile.in +--- evolution-2.12.2.orig/plugins/ipod-sync/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/ipod-sync/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/ipod-sync +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_ipod_sync_evolution_la_DEPENDENCIES = \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_ipod_sync_evolution_la_OBJECTS = ipod-sync.lo \ +- ical-format.lo evolution-ipod-sync.lo ipod.lo +-liborg_gnome_ipod_sync_evolution_la_OBJECTS = \ +- $(am_liborg_gnome_ipod_sync_evolution_la_OBJECTS) +-liborg_gnome_ipod_sync_evolution_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_ipod_sync_evolution_la_LDFLAGS) $(LDFLAGS) -o \ +- $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,19 +384,18 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ + -DDBUS_API_SUBJECT_TO_CHANGE + ++ + plugin_DATA = org-gnome-ipod-sync-evolution.eplug + plugin_LTLIBRARIES = liborg-gnome-ipod-sync-evolution.la ++ + liborg_gnome_ipod_sync_evolution_la_SOURCES = \ + ipod-sync.c \ + ical-format.c \ +@@ -411,79 +404,91 @@ + format-handler.h \ + evolution-ipod-sync.h + ++ + liborg_gnome_ipod_sync_evolution_la_LDFLAGS = -module -avoid-version + liborg_gnome_ipod_sync_evolution_la_LIBADD = \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + EXTRA_DIST = org-gnome-ipod-sync-evolution.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/ipod-sync ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_ipod_sync_evolution_la_DEPENDENCIES = ++am_liborg_gnome_ipod_sync_evolution_la_OBJECTS = ipod-sync.lo \ ++ ical-format.lo evolution-ipod-sync.lo ipod.lo ++liborg_gnome_ipod_sync_evolution_la_OBJECTS = \ ++ $(am_liborg_gnome_ipod_sync_evolution_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/evolution-ipod-sync.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ical-format.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ipod-sync.Plo ./$(DEPDIR)/ipod.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ipod-sync/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/ipod-sync/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-ipod-sync-evolution.la: $(liborg_gnome_ipod_sync_evolution_la_OBJECTS) $(liborg_gnome_ipod_sync_evolution_la_DEPENDENCIES) +- $(liborg_gnome_ipod_sync_evolution_la_LINK) -rpath $(plugindir) $(liborg_gnome_ipod_sync_evolution_la_OBJECTS) $(liborg_gnome_ipod_sync_evolution_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_ipod_sync_evolution_la_LDFLAGS) $(liborg_gnome_ipod_sync_evolution_la_OBJECTS) $(liborg_gnome_ipod_sync_evolution_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -494,49 +499,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipod.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -545,7 +575,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -557,11 +586,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -584,23 +612,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -615,10 +648,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -640,7 +672,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -655,34 +687,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -703,23 +725,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/itip-formatter/Makefile.in evolution-2.12.2/plugins/itip-formatter/Makefile.in +--- evolution-2.12.2.orig/plugins/itip-formatter/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/itip-formatter/Makefile.in 2007-12-05 15:54:59.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,66 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/itip-formatter +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_itip_formatter_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/calendar/gui/libevolution-calendar.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_liborg_gnome_itip_formatter_la_OBJECTS = itip-formatter.lo \ +- itip-view.lo +-liborg_gnome_itip_formatter_la_OBJECTS = \ +- $(am_liborg_gnome_itip_formatter_la_OBJECTS) +-liborg_gnome_itip_formatter_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_itip_formatter_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -124,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -135,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -160,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -185,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -193,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -251,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -275,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -299,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -307,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -314,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -323,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -345,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -375,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -394,19 +384,18 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + plugin_DATA = org-gnome-itip-formatter.eplug + plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la ++ + liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h + liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_itip_formatter_la_LIBADD = \ +@@ -416,80 +405,95 @@ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + error_DATA = org-gnome-itip-formatter.error + errordir = $(privdatadir)/errors ++ + BUILT_SOURCES = $(plugin_DATA) $(error_DATA) ++ + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + org-gnome-itip-formatter.eplug.xml \ + org-gnome-itip-formatter.error.xml + ++subdir = plugins/itip-formatter ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_itip_formatter_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/calendar/gui/libevolution-calendar.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_liborg_gnome_itip_formatter_la_OBJECTS = itip-formatter.lo \ ++ itip-view.lo ++liborg_gnome_itip_formatter_la_OBJECTS = \ ++ $(am_liborg_gnome_itip_formatter_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/itip-formatter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/itip-view.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) ++DATA = $(error_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/itip-formatter/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/itip-formatter/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-itip-formatter.la: $(liborg_gnome_itip_formatter_la_OBJECTS) $(liborg_gnome_itip_formatter_la_DEPENDENCIES) +- $(liborg_gnome_itip_formatter_la_LINK) -rpath $(plugindir) $(liborg_gnome_itip_formatter_la_OBJECTS) $(liborg_gnome_itip_formatter_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_itip_formatter_la_LDFLAGS) $(liborg_gnome_itip_formatter_la_OBJECTS) $(liborg_gnome_itip_formatter_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -498,66 +502,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itip-view.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -566,7 +596,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -578,11 +607,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -605,23 +633,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -636,10 +669,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -661,7 +693,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -676,14 +708,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -691,20 +721,12 @@ + install-data-am: install-errorDATA install-pluginDATA \ + 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 +@@ -725,25 +747,21 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-errorDATA 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-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-pluginDATA 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-errorDATA uninstall-pluginDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/mail-account-disable/Makefile.in evolution-2.12.2/plugins/mail-account-disable/Makefile.in +--- evolution-2.12.2.orig/plugins/mail-account-disable/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/mail-account-disable/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mail-account-disable +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libmail_account_disable_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) +-am_libmail_account_disable_la_OBJECTS = mail-account-disable.lo +-libmail_account_disable_la_OBJECTS = \ +- $(am_libmail_account_disable_la_OBJECTS) +-libmail_account_disable_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(libmail_account_disable_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libmail_account_disable_la_SOURCES) +-DIST_SOURCES = $(libmail_account_disable_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -402,83 +393,95 @@ + $(EVOLUTION_MAIL_CFLAGS) \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = org-gnome-mail-account-disable.eplug + plugin_LTLIBRARIES = libmail-account-disable.la ++ + libmail_account_disable_la_SOURCES = mail-account-disable.c + libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + libmail_account_disable_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) + ++ + EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mail-account-disable ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++libmail_account_disable_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_libmail_account_disable_la_OBJECTS = mail-account-disable.lo ++libmail_account_disable_la_OBJECTS = \ ++ $(am_libmail_account_disable_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-account-disable.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libmail_account_disable_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(libmail_account_disable_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-account-disable/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mail-account-disable/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libmail-account-disable.la: $(libmail_account_disable_la_OBJECTS) $(libmail_account_disable_la_DEPENDENCIES) +- $(libmail_account_disable_la_LINK) -rpath $(plugindir) $(libmail_account_disable_la_OBJECTS) $(libmail_account_disable_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(libmail_account_disable_la_LDFLAGS) $(libmail_account_disable_la_OBJECTS) $(libmail_account_disable_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -486,49 +489,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-account-disable.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -537,7 +565,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -549,11 +576,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -576,23 +602,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -607,10 +638,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -632,7 +662,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -647,34 +677,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -695,23 +715,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/mailing-list-actions/Makefile.in evolution-2.12.2/plugins/mailing-list-actions/Makefile.in +--- evolution-2.12.2.orig/plugins/mailing-list-actions/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/mailing-list-actions/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mailing-list-actions +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_mailing_list_actions_la_LIBADD = +-am_liborg_gnome_mailing_list_actions_la_OBJECTS = \ +- mailing-list-actions.lo +-liborg_gnome_mailing_list_actions_la_OBJECTS = \ +- $(am_liborg_gnome_mailing_list_actions_la_OBJECTS) +-liborg_gnome_mailing_list_actions_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_mailing_list_actions_la_LDFLAGS) $(LDFLAGS) -o \ +- $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) +-errorDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,99 +384,109 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/composer \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-mailing-list-actions.eplug org-gnome-mailing-list-actions.xml + plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la ++ + liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c + liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version ++ + error_DATA = org-gnome-mailing-list-actions.error + errordir = $(privdatadir)/errors ++ + BUILT_SOURCES = \ + org-gnome-mailing-list-actions.eplug \ + org-gnome-mailing-list-actions.error + ++ + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + org-gnome-mailing-list-actions.eplug.xml \ + org-gnome-mailing-list-actions.error.xml \ + org-gnome-mailing-list-actions.xml + ++subdir = plugins/mailing-list-actions ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mailing_list_actions_la_LIBADD = ++am_liborg_gnome_mailing_list_actions_la_OBJECTS = \ ++ mailing-list-actions.lo ++liborg_gnome_mailing_list_actions_la_OBJECTS = \ ++ $(am_liborg_gnome_mailing_list_actions_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mailing-list-actions.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) ++DATA = $(error_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mailing-list-actions/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mailing-list-actions/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mailing-list-actions.la: $(liborg_gnome_mailing_list_actions_la_OBJECTS) $(liborg_gnome_mailing_list_actions_la_DEPENDENCIES) +- $(liborg_gnome_mailing_list_actions_la_LINK) -rpath $(plugindir) $(liborg_gnome_mailing_list_actions_la_OBJECTS) $(liborg_gnome_mailing_list_actions_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mailing_list_actions_la_LDFLAGS) $(liborg_gnome_mailing_list_actions_la_OBJECTS) $(liborg_gnome_mailing_list_actions_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -490,66 +494,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailing-list-actions.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -558,7 +588,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -570,11 +599,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -597,23 +625,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -628,10 +661,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -653,7 +685,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -668,14 +700,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -683,20 +713,12 @@ + install-data-am: install-errorDATA install-pluginDATA \ + 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 +@@ -717,25 +739,21 @@ + + ps-am: + +-uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-errorDATA 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-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-errorDATA \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-pluginDATA 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-errorDATA uninstall-pluginDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/mail-notification/Makefile.in evolution-2.12.2/plugins/mail-notification/Makefile.in +--- evolution-2.12.2.orig/plugins/mail-notification/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/mail-notification/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mail-notification +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ +- "$(DESTDIR)$(schemadir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_mail_notification_la_LIBADD = +-am_liborg_gnome_mail_notification_la_OBJECTS = mail-notification.lo +-liborg_gnome_mail_notification_la_OBJECTS = \ +- $(am_liborg_gnome_mail_notification_la_OBJECTS) +-liborg_gnome_mail_notification_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_mail_notification_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) $(schema_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -402,90 +395,103 @@ + $(LIBNOTIFY_CFLAGS) \ + $(NMN_CFLAGS) + ++ + plugin_DATA = org-gnome-mail-notification.eplug + plugin_LTLIBRARIES = liborg-gnome-mail-notification.la ++ + liborg_gnome_mail_notification_la_SOURCES = mail-notification.c + liborg_gnome_mail_notification_la_LDFLAGS = \ + -module -avoid-version \ + $(LIBNOTIFY_LIBS) \ + $(NMN_LIBS) + ++ + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = apps-evolution-mail-notification.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + BUILT_SOURCES = $(plugin_DATA) ++ + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++ + EXTRA_DIST = \ + org-gnome-mail-notification.eplug.xml \ + $(schema_in_files) + ++subdir = plugins/mail-notification ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mail_notification_la_LIBADD = ++am_liborg_gnome_mail_notification_la_OBJECTS = mail-notification.lo ++liborg_gnome_mail_notification_la_OBJECTS = \ ++ $(am_liborg_gnome_mail_notification_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-notification.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) ++DATA = $(plugin_DATA) $(schema_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-notification/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mail-notification/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mail-notification.la: $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_DEPENDENCIES) +- $(liborg_gnome_mail_notification_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_notification_la_LDFLAGS) $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -493,66 +499,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-notification.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -561,7 +593,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -573,11 +604,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -600,23 +630,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -631,10 +666,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -656,7 +690,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -672,14 +706,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -687,20 +719,12 @@ + install-data-am: install-data-local install-pluginDATA \ + install-pluginLTLIBRARIES install-schemaDATA + +-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 +@@ -721,25 +745,21 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ +- uninstall-schemaDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES uninstall-schemaDATA + + .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-data-local 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-ps \ +- install-ps-am install-schemaDATA 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 \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-pluginDATA install-pluginLTLIBRARIES \ ++ install-schemaDATA 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-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA + + +diff -ruN evolution-2.12.2.orig/plugins/mail-remote/Makefile.in evolution-2.12.2/plugins/mail-remote/Makefile.in +--- evolution-2.12.2.orig/plugins/mail-remote/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/mail-remote/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,84 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = client$(EXEEXT) +-subdir = plugins/mail-remote +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_evolution_mail_remote_la_LIBADD = +-am__objects_1 = Evolution-DataServer-Mail-common.lo \ +- Evolution-DataServer-Mail-skels.lo \ +- Evolution-DataServer-Mail-stubs.lo +-am__objects_2 = +-am_liborg_gnome_evolution_mail_remote_la_OBJECTS = $(am__objects_1) \ +- $(am__objects_2) e-corba-utils.lo em-message-stream.lo \ +- evolution-mail-folder.lo evolution-mail-folderlistener.lo \ +- evolution-mail-marshal.lo evolution-mail-messageiterator.lo \ +- evolution-mail-messagestream.lo evolution-mail-session.lo \ +- evolution-mail-sessionlistener.lo evolution-mail-store.lo \ +- evolution-mail-storelistener.lo mail-remote.lo +-liborg_gnome_evolution_mail_remote_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_mail_remote_la_OBJECTS) +-liborg_gnome_evolution_mail_remote_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_mail_remote_la_LDFLAGS) $(LDFLAGS) -o \ +- $@ +-PROGRAMS = $(noinst_PROGRAMS) +-am_client_OBJECTS = client.$(OBJEXT) +-client_OBJECTS = $(am_client_OBJECTS) +-am__DEPENDENCIES_1 = +-client_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- evolution-mail-sessionlistener.o \ +- evolution-mail-storelistener.o evolution-mail-folderlistener.o \ +- evolution-mail-marshal.o evolution-mail-messagestream.o \ +- Evolution-DataServer-Mail-common.o \ +- Evolution-DataServer-Mail-stubs.o \ +- Evolution-DataServer-Mail-skels.o Evolution-common.o \ +- Evolution-stubs.o +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) \ +- $(client_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) \ +- $(client_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -143,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -154,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -179,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -204,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -212,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -270,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -294,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -318,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -326,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -333,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -342,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -364,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -394,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -413,18 +384,18 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-evolution-mail-remote.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-mail-remote.la ++ + liborg_gnome_evolution_mail_remote_la_SOURCES = \ + $(IDL_GENERATED_C) \ + $(IDL_GENERATED_H) \ +@@ -452,10 +423,13 @@ + evolution-mail-storelistener.h \ + mail-remote.c + ++ + liborg_gnome_evolution_mail_remote_la_LDFLAGS = -module -avoid-version ++ + client_SOURCES = \ + client.c + ++ + client_LDADD = \ + $(EVOLUTION_MAIL_LIBS) \ + evolution-mail-sessionlistener.o \ +@@ -470,16 +444,24 @@ + Evolution-stubs.o + + ++noinst_PROGRAMS = \ ++ client ++ ++ ++ + # mail idl + IDL = Evolution-DataServer-Mail.idl ++ + IDL_GENERATED_H = \ + Evolution-DataServer-Mail.h + ++ + IDL_GENERATED_C = \ + Evolution-DataServer-Mail-common.c \ + Evolution-DataServer-Mail-skels.c \ + Evolution-DataServer-Mail-stubs.c + ++ + EVO_GENERATED = Evolution.h Evolution-common.c Evolution-stubs.c Evolution-skels.c + + # installed idls +@@ -488,77 +470,123 @@ + + # marshallers for glib + MARSHAL_GENERATED = evolution-mail-marshal.c evolution-mail-marshal.h ++ + EXTRA_DIST = \ + $(IDL) \ + Evolution.idl \ + evolution-mail-marshal.list \ + org-gnome-evolution-mail-remote.eplug.xml + ++ + BUILT_SOURCES = $(IDL_GENERATED_H) $(IDL_GENERATED_C) $(MARSHAL_GENERATED) $(SHELL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mail-remote ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_mail_remote_la_LIBADD = ++am__objects_1 = Evolution-DataServer-Mail-common.lo \ ++ Evolution-DataServer-Mail-skels.lo \ ++ Evolution-DataServer-Mail-stubs.lo ++am__objects_2 = ++am_liborg_gnome_evolution_mail_remote_la_OBJECTS = $(am__objects_1) \ ++ $(am__objects_2) e-corba-utils.lo em-message-stream.lo \ ++ evolution-mail-folder.lo evolution-mail-folderlistener.lo \ ++ evolution-mail-marshal.lo evolution-mail-messageiterator.lo \ ++ evolution-mail-messagestream.lo evolution-mail-session.lo \ ++ evolution-mail-sessionlistener.lo evolution-mail-store.lo \ ++ evolution-mail-storelistener.lo mail-remote.lo ++liborg_gnome_evolution_mail_remote_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_mail_remote_la_OBJECTS) ++noinst_PROGRAMS = client$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++ ++am_client_OBJECTS = client.$(OBJEXT) ++client_OBJECTS = $(am_client_OBJECTS) ++client_DEPENDENCIES = evolution-mail-sessionlistener.o \ ++ evolution-mail-storelistener.o evolution-mail-folderlistener.o \ ++ evolution-mail-marshal.o evolution-mail-messagestream.o \ ++ Evolution-DataServer-Mail-common.o \ ++ Evolution-DataServer-Mail-stubs.o \ ++ Evolution-DataServer-Mail-skels.o Evolution-common.o \ ++ Evolution-stubs.o ++client_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-DataServer-Mail-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-Mail-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-Mail-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/client.Po ./$(DEPDIR)/e-corba-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/em-message-stream.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-folder.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-folderlistener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-messageiterator.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-messagestream.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-session.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-sessionlistener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-store.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-storelistener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/mail-remote.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) \ ++ $(client_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) $(client_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-remote/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mail-remote/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-mail-remote.la: $(liborg_gnome_evolution_mail_remote_la_OBJECTS) $(liborg_gnome_evolution_mail_remote_la_DEPENDENCIES) +- $(liborg_gnome_evolution_mail_remote_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_remote_la_OBJECTS) $(liborg_gnome_evolution_mail_remote_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_remote_la_LDFLAGS) $(liborg_gnome_evolution_mail_remote_la_OBJECTS) $(liborg_gnome_evolution_mail_remote_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -568,10 +596,10 @@ + done + client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) + @rm -f client$(EXEEXT) +- $(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS) ++ $(LINK) $(client_LDFLAGS) $(client_OBJECTS) $(client_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -594,49 +622,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-remote.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -645,7 +698,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -657,11 +709,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -684,23 +735,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -715,10 +771,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -740,7 +795,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -755,34 +810,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -803,24 +848,21 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ uninstall-pluginLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS 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-ps \ +- install-ps-am 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 ++ distclean-libtool distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ ++ uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + + @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.12.2.orig/plugins/mail-to-meeting/Makefile.in evolution-2.12.2/plugins/mail-to-meeting/Makefile.in +--- evolution-2.12.2.orig/plugins/mail-to-meeting/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/mail-to-meeting/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mail-to-meeting +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_mail_to_meeting_la_LIBADD = +-am_liborg_gnome_mail_to_meeting_la_OBJECTS = mail-to-meeting.lo +-liborg_gnome_mail_to_meeting_la_OBJECTS = \ +- $(am_liborg_gnome_mail_to_meeting_la_OBJECTS) +-liborg_gnome_mail_to_meeting_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_mail_to_meeting_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,89 +384,96 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-mail-to-meeting.eplug + plugin_LTLIBRARIES = liborg-gnome-mail-to-meeting.la ++ + liborg_gnome_mail_to_meeting_la_SOURCES = mail-to-meeting.c + liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-mail-to-meeting.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mail-to-meeting ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mail_to_meeting_la_LIBADD = ++am_liborg_gnome_mail_to_meeting_la_OBJECTS = mail-to-meeting.lo ++liborg_gnome_mail_to_meeting_la_OBJECTS = \ ++ $(am_liborg_gnome_mail_to_meeting_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-to-meeting.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-to-meeting/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mail-to-meeting/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mail-to-meeting.la: $(liborg_gnome_mail_to_meeting_la_OBJECTS) $(liborg_gnome_mail_to_meeting_la_DEPENDENCIES) +- $(liborg_gnome_mail_to_meeting_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_meeting_la_OBJECTS) $(liborg_gnome_mail_to_meeting_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_meeting_la_LDFLAGS) $(liborg_gnome_mail_to_meeting_la_OBJECTS) $(liborg_gnome_mail_to_meeting_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -476,49 +481,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-to-meeting.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -527,7 +557,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,11 +568,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,23 +594,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +630,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -622,7 +654,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +669,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -685,23 +707,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/mail-to-task/Makefile.in evolution-2.12.2/plugins/mail-to-task/Makefile.in +--- evolution-2.12.2.orig/plugins/mail-to-task/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/mail-to-task/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mail-to-task +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_mail_to_task_la_LIBADD = +-am_liborg_gnome_mail_to_task_la_OBJECTS = mail-to-task.lo +-liborg_gnome_mail_to_task_la_OBJECTS = \ +- $(am_liborg_gnome_mail_to_task_la_OBJECTS) +-liborg_gnome_mail_to_task_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_mail_to_task_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,91 +384,98 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-mail-to-task.eplug org-gnome-mail-to-task.xml + plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la ++ + liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c + liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \ + org-gnome-mail-to-task.xml + ++ + BUILT_SOURCES = org-gnome-mail-to-task.eplug + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mail-to-task ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mail_to_task_la_LIBADD = ++am_liborg_gnome_mail_to_task_la_OBJECTS = mail-to-task.lo ++liborg_gnome_mail_to_task_la_OBJECTS = \ ++ $(am_liborg_gnome_mail_to_task_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-to-task.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-to-task/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mail-to-task/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mail-to-task.la: $(liborg_gnome_mail_to_task_la_OBJECTS) $(liborg_gnome_mail_to_task_la_DEPENDENCIES) +- $(liborg_gnome_mail_to_task_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_task_la_OBJECTS) $(liborg_gnome_mail_to_task_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_task_la_LDFLAGS) $(liborg_gnome_mail_to_task_la_OBJECTS) $(liborg_gnome_mail_to_task_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -478,49 +483,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-to-task.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -529,7 +559,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -541,11 +570,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -568,23 +596,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -599,10 +632,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -624,7 +656,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -639,34 +671,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -687,23 +709,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/Makefile.in evolution-2.12.2/plugins/Makefile.in +--- evolution-2.12.2.orig/plugins/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/Makefile.in 2007-12-05 15:54:56.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,36 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -92,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -103,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -128,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -153,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -161,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -219,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -243,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -267,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -275,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -282,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -291,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -313,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -343,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -362,46 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = $(plugins_enabled) + DIST_SUBDIRS = $(all_plugins_base) $(all_plugins_standard) $(all_plugins_experimental) profiler ++subdir = plugins ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -568,17 +578,13 @@ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/plugins/mark-all-read/Makefile.in evolution-2.12.2/plugins/mark-all-read/Makefile.in +--- evolution-2.12.2.orig/plugins/mark-all-read/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/mark-all-read/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mark-all-read +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_mark_all_read_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_mark_all_read_la_OBJECTS = mark-all-read.lo +-liborg_gnome_mark_all_read_la_OBJECTS = \ +- $(am_liborg_gnome_mark_all_read_la_OBJECTS) +-liborg_gnome_mark_all_read_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_mark_all_read_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,19 +384,18 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)\ + -I$(top_srcdir)/camel \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-mark-all-read.eplug + plugin_LTLIBRARIES = liborg-gnome-mark-all-read.la ++ + liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c + liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_mark_all_read_la_LIBADD = \ +@@ -410,75 +403,85 @@ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) + ++ + EXTRA_DIST = org-gnome-mark-all-read.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mark-all-read ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mark_all_read_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_liborg_gnome_mark_all_read_la_OBJECTS = mark-all-read.lo ++liborg_gnome_mark_all_read_la_OBJECTS = \ ++ $(am_liborg_gnome_mark_all_read_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mark-all-read.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mark-all-read/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mark-all-read/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mark-all-read.la: $(liborg_gnome_mark_all_read_la_OBJECTS) $(liborg_gnome_mark_all_read_la_DEPENDENCIES) +- $(liborg_gnome_mark_all_read_la_LINK) -rpath $(plugindir) $(liborg_gnome_mark_all_read_la_OBJECTS) $(liborg_gnome_mark_all_read_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mark_all_read_la_LDFLAGS) $(liborg_gnome_mark_all_read_la_OBJECTS) $(liborg_gnome_mark_all_read_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -486,49 +489,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark-all-read.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -537,7 +565,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -549,11 +576,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -576,23 +602,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -607,10 +638,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -632,7 +662,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -647,34 +677,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -695,23 +715,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/mark-calendar-offline/Makefile.in evolution-2.12.2/plugins/mark-calendar-offline/Makefile.in +--- evolution-2.12.2.orig/plugins/mark-calendar-offline/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/mark-calendar-offline/Makefile.in 2007-12-05 15:55:00.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mark-calendar-offline +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_mark_calendar_offline_la_LIBADD = +-am_liborg_gnome_mark_calendar_offline_la_OBJECTS = \ +- mark-calendar-offline.lo +-liborg_gnome_mark_calendar_offline_la_OBJECTS = \ +- $(am_liborg_gnome_mark_calendar_offline_la_OBJECTS) +-liborg_gnome_mark_calendar_offline_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_mark_calendar_offline_la_LDFLAGS) $(LDFLAGS) -o \ +- $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,89 +384,97 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + plugin_DATA = org-gnome-mark-calendar-offline.eplug + plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la ++ + liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c + liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mark-calendar-offline ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_mark_calendar_offline_la_LIBADD = ++am_liborg_gnome_mark_calendar_offline_la_OBJECTS = \ ++ mark-calendar-offline.lo ++liborg_gnome_mark_calendar_offline_la_OBJECTS = \ ++ $(am_liborg_gnome_mark_calendar_offline_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mark-calendar-offline.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mark-calendar-offline/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mark-calendar-offline/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-mark-calendar-offline.la: $(liborg_gnome_mark_calendar_offline_la_OBJECTS) $(liborg_gnome_mark_calendar_offline_la_DEPENDENCIES) +- $(liborg_gnome_mark_calendar_offline_la_LINK) -rpath $(plugindir) $(liborg_gnome_mark_calendar_offline_la_OBJECTS) $(liborg_gnome_mark_calendar_offline_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_mark_calendar_offline_la_LDFLAGS) $(liborg_gnome_mark_calendar_offline_la_OBJECTS) $(liborg_gnome_mark_calendar_offline_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -478,49 +482,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark-calendar-offline.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -529,7 +558,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -541,11 +569,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -568,23 +595,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -599,10 +631,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -624,7 +655,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -639,34 +670,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -687,23 +708,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/mono/Makefile.in evolution-2.12.2/plugins/mono/Makefile.in +--- evolution-2.12.2.orig/plugins/mono/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/mono/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/mono +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_evolution_mono_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +-am_liborg_gnome_evolution_mono_la_OBJECTS = mono-plugin.lo +-liborg_gnome_evolution_mono_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_mono_la_OBJECTS) +-liborg_gnome_evolution_mono_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_mono_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,92 +384,99 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(E_UTIL_CFLAGS) + ++ + plugin_DATA = org-gnome-evolution-mono.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la ++ + liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h + liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version + liborg_gnome_evolution_mono_la_LIBADD = \ + $(E_UTIL_LIBS) + ++ + EXTRA_DIST = org-gnome-evolution-mono.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/mono ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_mono_la_DEPENDENCIES = ++am_liborg_gnome_evolution_mono_la_OBJECTS = mono-plugin.lo ++liborg_gnome_evolution_mono_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_mono_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mono-plugin.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mono/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/mono/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-mono.la: $(liborg_gnome_evolution_mono_la_OBJECTS) $(liborg_gnome_evolution_mono_la_DEPENDENCIES) +- $(liborg_gnome_evolution_mono_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mono_la_OBJECTS) $(liborg_gnome_evolution_mono_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mono_la_LDFLAGS) $(liborg_gnome_evolution_mono_la_OBJECTS) $(liborg_gnome_evolution_mono_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -480,49 +484,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -531,7 +560,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -543,11 +571,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -570,23 +597,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -601,10 +633,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -626,7 +657,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -641,34 +672,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -689,23 +710,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/new-mail-notify/Makefile.in evolution-2.12.2/plugins/new-mail-notify/Makefile.in +--- evolution-2.12.2.orig/plugins/new-mail-notify/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/new-mail-notify/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/new-mail-notify +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_new_mail_notify_la_LIBADD = +-am_liborg_gnome_new_mail_notify_la_OBJECTS = new-mail-notify.lo +-liborg_gnome_new_mail_notify_la_OBJECTS = \ +- $(am_liborg_gnome_new_mail_notify_la_OBJECTS) +-liborg_gnome_new_mail_notify_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_new_mail_notify_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -236,6 +230,7 @@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ ++ + LIBS = \ + $(NMN_LIBS) + +@@ -245,22 +240,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +268,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +294,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +303,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +312,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +320,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +340,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +369,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,11 +387,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_builddir)/composer \ +@@ -402,79 +398,89 @@ + $(EVOLUTION_MAIL_CFLAGS) \ + $(NMN_CFLAGS) + ++ + plugin_DATA = org-gnome-new-mail-notify.eplug + plugin_LTLIBRARIES = liborg-gnome-new-mail-notify.la ++ + liborg_gnome_new_mail_notify_la_SOURCES = new-mail-notify.c + liborg_gnome_new_mail_notify_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-new-mail-notify.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/new-mail-notify ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_new_mail_notify_la_LIBADD = ++am_liborg_gnome_new_mail_notify_la_OBJECTS = new-mail-notify.lo ++liborg_gnome_new_mail_notify_la_OBJECTS = \ ++ $(am_liborg_gnome_new_mail_notify_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/new-mail-notify.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/new-mail-notify/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/new-mail-notify/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-new-mail-notify.la: $(liborg_gnome_new_mail_notify_la_OBJECTS) $(liborg_gnome_new_mail_notify_la_DEPENDENCIES) +- $(liborg_gnome_new_mail_notify_la_LINK) -rpath $(plugindir) $(liborg_gnome_new_mail_notify_la_OBJECTS) $(liborg_gnome_new_mail_notify_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_new_mail_notify_la_LDFLAGS) $(liborg_gnome_new_mail_notify_la_OBJECTS) $(liborg_gnome_new_mail_notify_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -482,49 +488,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/new-mail-notify.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -533,7 +564,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -545,11 +575,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -572,23 +601,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -603,10 +637,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -628,7 +661,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -643,34 +676,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -691,23 +714,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/plugin-manager/Makefile.in evolution-2.12.2/plugins/plugin-manager/Makefile.in +--- evolution-2.12.2.orig/plugins/plugin-manager/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/plugins/plugin-manager/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/plugin-manager +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_plugin_manager_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_liborg_gnome_plugin_manager_la_OBJECTS = plugin-manager.lo +-liborg_gnome_plugin_manager_la_OBJECTS = \ +- $(am_liborg_gnome_plugin_manager_la_OBJECTS) +-liborg_gnome_plugin_manager_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_plugin_manager_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,96 +384,105 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-plugin-manager.eplug org-gnome-plugin-manager.xml + plugin_LTLIBRARIES = liborg-gnome-plugin-manager.la ++ + liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c + liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_plugin_manager_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_MAIL_LIBS) + ++ + EXTRA_DIST = \ + org-gnome-plugin-manager.eplug.xml \ + org-gnome-plugin-manager.xml + ++ + BUILT_SOURCES = org-gnome-plugin-manager.eplug ++ + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/plugin-manager ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_plugin_manager_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la ++am_liborg_gnome_plugin_manager_la_OBJECTS = plugin-manager.lo ++liborg_gnome_plugin_manager_la_OBJECTS = \ ++ $(am_liborg_gnome_plugin_manager_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plugin-manager.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/plugin-manager/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/plugin-manager/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-plugin-manager.la: $(liborg_gnome_plugin_manager_la_OBJECTS) $(liborg_gnome_plugin_manager_la_DEPENDENCIES) +- $(liborg_gnome_plugin_manager_la_LINK) -rpath $(plugindir) $(liborg_gnome_plugin_manager_la_OBJECTS) $(liborg_gnome_plugin_manager_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_plugin_manager_la_LDFLAGS) $(liborg_gnome_plugin_manager_la_OBJECTS) $(liborg_gnome_plugin_manager_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -485,49 +490,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin-manager.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -536,7 +566,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -548,11 +577,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -575,23 +603,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -606,10 +639,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -631,7 +663,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -646,34 +678,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -694,23 +716,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/prefer-plain/Makefile.in evolution-2.12.2/plugins/prefer-plain/Makefile.in +--- evolution-2.12.2.orig/plugins/prefer-plain/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/prefer-plain/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/prefer-plain +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_prefer_plain_la_LIBADD = +-am_liborg_gnome_prefer_plain_la_OBJECTS = prefer-plain.lo +-liborg_gnome_prefer_plain_la_OBJECTS = \ +- $(am_liborg_gnome_prefer_plain_la_OBJECTS) +-liborg_gnome_prefer_plain_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_prefer_plain_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,89 +384,96 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-prefer-plain.eplug + plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la ++ + liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c + liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-prefer-plain.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/prefer-plain ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_prefer_plain_la_LIBADD = ++am_liborg_gnome_prefer_plain_la_OBJECTS = prefer-plain.lo ++liborg_gnome_prefer_plain_la_OBJECTS = \ ++ $(am_liborg_gnome_prefer_plain_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/prefer-plain.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/prefer-plain/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/prefer-plain/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-prefer-plain.la: $(liborg_gnome_prefer_plain_la_OBJECTS) $(liborg_gnome_prefer_plain_la_DEPENDENCIES) +- $(liborg_gnome_prefer_plain_la_LINK) -rpath $(plugindir) $(liborg_gnome_prefer_plain_la_OBJECTS) $(liborg_gnome_prefer_plain_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_prefer_plain_la_LDFLAGS) $(liborg_gnome_prefer_plain_la_OBJECTS) $(liborg_gnome_prefer_plain_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -476,49 +481,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefer-plain.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -527,7 +557,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,11 +568,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,23 +594,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +630,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -622,7 +654,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +669,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -685,23 +707,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/print-message/Makefile.in evolution-2.12.2/plugins/print-message/Makefile.in +--- evolution-2.12.2.orig/plugins/print-message/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/print-message/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/print-message +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_print_message_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_print_message_la_OBJECTS = print-message.lo +-liborg_gnome_print_message_la_OBJECTS = \ +- $(am_liborg_gnome_print_message_la_OBJECTS) +-liborg_gnome_print_message_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_print_message_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_print_message_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_print_message_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,19 +384,18 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/composer \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-print-message.eplug org-gnome-print-message.xml + plugin_LTLIBRARIES = liborg-gnome-print-message.la ++ + liborg_gnome_print_message_la_SOURCES = print-message.c + liborg_gnome_print_message_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + liborg_gnome_print_message_la_LIBADD = \ +@@ -410,78 +403,88 @@ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) + ++ + EXTRA_DIST = \ + org-gnome-print-message.eplug.xml\ + org-gnome-print-message.xml + ++ + BUILT_SOURCES = org-gnome-print-message.eplug + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/print-message ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_print_message_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_liborg_gnome_print_message_la_OBJECTS = print-message.lo ++liborg_gnome_print_message_la_OBJECTS = \ ++ $(am_liborg_gnome_print_message_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/print-message.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_print_message_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_print_message_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/print-message/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/print-message/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-print-message.la: $(liborg_gnome_print_message_la_OBJECTS) $(liborg_gnome_print_message_la_DEPENDENCIES) +- $(liborg_gnome_print_message_la_LINK) -rpath $(plugindir) $(liborg_gnome_print_message_la_OBJECTS) $(liborg_gnome_print_message_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_print_message_la_LDFLAGS) $(liborg_gnome_print_message_la_OBJECTS) $(liborg_gnome_print_message_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -489,49 +492,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-message.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -540,7 +568,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -552,11 +579,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -579,23 +605,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -610,10 +641,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -635,7 +665,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -650,34 +680,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -698,23 +718,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/profiler/Makefile.in evolution-2.12.2/plugins/profiler/Makefile.in +--- evolution-2.12.2.orig/plugins/profiler/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/profiler/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/profiler +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_evolution_profiler_la_LIBADD = +-am_liborg_gnome_evolution_profiler_la_OBJECTS = profiler.lo +-liborg_gnome_evolution_profiler_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_profiler_la_OBJECTS) +-liborg_gnome_evolution_profiler_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_profiler_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -236,6 +230,7 @@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ ++ + LIBS = $(SHELL_LIBS) + LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ + LIBSOUP_LIBS = @LIBSOUP_LIBS@ +@@ -243,22 +238,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +266,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +292,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +301,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +310,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +318,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +338,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +367,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,89 +385,96 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(SHELL_CFLAGS) + ++ + plugin_DATA = org-gnome-evolution-profiler.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-profiler.la ++ + liborg_gnome_evolution_profiler_la_SOURCES = profiler.c + liborg_gnome_evolution_profiler_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-evolution-profiler.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/profiler ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_profiler_la_LIBADD = ++am_liborg_gnome_evolution_profiler_la_OBJECTS = profiler.lo ++liborg_gnome_evolution_profiler_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_profiler_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/profiler.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/profiler/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/profiler/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-profiler.la: $(liborg_gnome_evolution_profiler_la_OBJECTS) $(liborg_gnome_evolution_profiler_la_DEPENDENCIES) +- $(liborg_gnome_evolution_profiler_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_profiler_la_OBJECTS) $(liborg_gnome_evolution_profiler_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_profiler_la_LDFLAGS) $(liborg_gnome_evolution_profiler_la_OBJECTS) $(liborg_gnome_evolution_profiler_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -476,49 +482,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profiler.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -527,7 +558,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,11 +569,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,23 +595,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +631,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -622,7 +655,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +670,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -685,23 +708,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/publish-calendar/Makefile.in evolution-2.12.2/plugins/publish-calendar/Makefile.in +--- evolution-2.12.2.orig/plugins/publish-calendar/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/publish-calendar/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,66 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/publish-calendar +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_publish_calendar_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/calendar/gui/libevolution-calendar.la \ +- $(am__DEPENDENCIES_1) +-am_liborg_gnome_publish_calendar_la_OBJECTS = publish-calendar.lo \ +- publish-format-fb.lo publish-format-ical.lo \ +- publish-location.lo url-editor-dialog.lo +-liborg_gnome_publish_calendar_la_OBJECTS = \ +- $(am_liborg_gnome_publish_calendar_la_OBJECTS) +-liborg_gnome_publish_calendar_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_publish_calendar_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -124,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -135,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -160,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -185,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -193,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -251,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -275,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -299,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -307,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -314,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -323,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -345,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -375,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -394,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -407,14 +394,18 @@ + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" + ++ + plugin_DATA = \ + org-gnome-publish-calendar.eplug \ + org-gnome-publish-calendar.xml + ++ + glade_DATA = \ + publish-calendar.glade + ++ + plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la ++ + liborg_gnome_publish_calendar_la_SOURCES = \ + publish-calendar.c \ + publish-format-fb.c \ +@@ -426,83 +417,101 @@ + url-editor-dialog.c \ + url-editor-dialog.h + ++ + liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + liborg_gnome_publish_calendar_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/calendar/gui/libevolution-calendar.la \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + EXTRA_DIST = \ + org-gnome-publish-calendar.eplug.xml \ + org-gnome-publish-calendar.xml \ + $(glade_DATA) + ++ + CLEANFILES = org-gnome-publish-calendar.eplug ++subdir = plugins/publish-calendar ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_publish_calendar_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/calendar/gui/libevolution-calendar.la ++am_liborg_gnome_publish_calendar_la_OBJECTS = publish-calendar.lo \ ++ publish-format-fb.lo publish-format-ical.lo publish-location.lo \ ++ url-editor-dialog.lo ++liborg_gnome_publish_calendar_la_OBJECTS = \ ++ $(am_liborg_gnome_publish_calendar_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/publish-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/publish-format-fb.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/publish-format-ical.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/publish-location.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/url-editor-dialog.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) ++DATA = $(glade_DATA) $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/publish-calendar/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/publish-calendar/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-publish-calendar.la: $(liborg_gnome_publish_calendar_la_OBJECTS) $(liborg_gnome_publish_calendar_la_DEPENDENCIES) +- $(liborg_gnome_publish_calendar_la_LINK) -rpath $(plugindir) $(liborg_gnome_publish_calendar_la_OBJECTS) $(liborg_gnome_publish_calendar_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_publish_calendar_la_LDFLAGS) $(liborg_gnome_publish_calendar_la_OBJECTS) $(liborg_gnome_publish_calendar_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -514,66 +523,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url-editor-dialog.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -582,7 +617,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -594,11 +628,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -621,23 +654,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -651,10 +689,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -675,7 +712,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -689,14 +726,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -704,20 +739,12 @@ + install-data-am: install-gladeDATA install-pluginDATA \ + 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 +@@ -738,25 +765,21 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-pluginDATA \ ++uninstall-am: uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + +-.MAKE: install-am install-strip +- + .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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-pluginDATA 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-gladeDATA uninstall-pluginDATA \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ++ pdf-am ps ps-am tags uninstall uninstall-am uninstall-gladeDATA \ ++ uninstall-info-am uninstall-pluginDATA \ + uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/sa-junk-plugin/Makefile.in evolution-2.12.2/plugins/sa-junk-plugin/Makefile.in +--- evolution-2.12.2.orig/plugins/sa-junk-plugin/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/plugins/sa-junk-plugin/Makefile.in 2007-12-05 15:55:01.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/sa-junk-plugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_sa_junk_plugin_la_LIBADD = +-am_liborg_gnome_sa_junk_plugin_la_OBJECTS = em-junk-filter.lo +-liborg_gnome_sa_junk_plugin_la_OBJECTS = \ +- $(am_liborg_gnome_sa_junk_plugin_la_OBJECTS) +-liborg_gnome_sa_junk_plugin_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_sa_junk_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,91 +384,99 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-sa-junk-plugin.eplug + plugin_LTLIBRARIES = liborg-gnome-sa-junk-plugin.la ++ + liborg_gnome_sa_junk_plugin_la_SOURCES = em-junk-filter.c + liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + BUILT_SOURCES = $(plugin_DATA) $(error_DATA) ++ + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = \ + org-gnome-sa-junk-plugin.eplug.xml + ++subdir = plugins/sa-junk-plugin ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_sa_junk_plugin_la_LIBADD = ++am_liborg_gnome_sa_junk_plugin_la_OBJECTS = em-junk-filter.lo ++liborg_gnome_sa_junk_plugin_la_OBJECTS = \ ++ $(am_liborg_gnome_sa_junk_plugin_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/em-junk-filter.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/sa-junk-plugin/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/sa-junk-plugin/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-sa-junk-plugin.la: $(liborg_gnome_sa_junk_plugin_la_OBJECTS) $(liborg_gnome_sa_junk_plugin_la_DEPENDENCIES) +- $(liborg_gnome_sa_junk_plugin_la_LINK) -rpath $(plugindir) $(liborg_gnome_sa_junk_plugin_la_OBJECTS) $(liborg_gnome_sa_junk_plugin_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_sa_junk_plugin_la_LDFLAGS) $(liborg_gnome_sa_junk_plugin_la_OBJECTS) $(liborg_gnome_sa_junk_plugin_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -478,49 +484,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/em-junk-filter.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -529,7 +560,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -541,11 +571,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -568,23 +597,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -599,10 +633,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -624,7 +657,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -639,34 +672,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -687,23 +710,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/save-attachments/Makefile.in evolution-2.12.2/plugins/save-attachments/Makefile.in +--- evolution-2.12.2.orig/plugins/save-attachments/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/save-attachments/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/save-attachments +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_save_attachments_la_LIBADD = +-am_liborg_gnome_save_attachments_la_OBJECTS = save-attachments.lo +-liborg_gnome_save_attachments_la_OBJECTS = \ +- $(am_liborg_gnome_save_attachments_la_OBJECTS) +-liborg_gnome_save_attachments_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_save_attachments_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,92 +384,99 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-save-attachments.eplug org-gnome-save-attachments.xml + plugin_LTLIBRARIES = liborg-gnome-save-attachments.la ++ + liborg_gnome_save_attachments_la_SOURCES = save-attachments.c + liborg_gnome_save_attachments_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = \ + org-gnome-save-attachments.eplug.xml \ + org-gnome-save-attachments.xml + ++ + BUILT_SOURCES = org-gnome-save-attachments.eplug + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/save-attachments ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_save_attachments_la_LIBADD = ++am_liborg_gnome_save_attachments_la_OBJECTS = save-attachments.lo ++liborg_gnome_save_attachments_la_OBJECTS = \ ++ $(am_liborg_gnome_save_attachments_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/save-attachments.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/save-attachments/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/save-attachments/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-save-attachments.la: $(liborg_gnome_save_attachments_la_OBJECTS) $(liborg_gnome_save_attachments_la_DEPENDENCIES) +- $(liborg_gnome_save_attachments_la_LINK) -rpath $(plugindir) $(liborg_gnome_save_attachments_la_OBJECTS) $(liborg_gnome_save_attachments_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_save_attachments_la_LDFLAGS) $(liborg_gnome_save_attachments_la_OBJECTS) $(liborg_gnome_save_attachments_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -479,49 +484,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-attachments.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -530,7 +560,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -542,11 +571,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -569,23 +597,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -600,10 +633,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -625,7 +657,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -640,34 +672,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -688,23 +710,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/save-calendar/Makefile.in evolution-2.12.2/plugins/save-calendar/Makefile.in +--- evolution-2.12.2.orig/plugins/save-calendar/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/save-calendar/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,59 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/save-calendar +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_save_calendar_la_LIBADD = +-am_liborg_gnome_save_calendar_la_OBJECTS = save-calendar.lo \ +- ical-format.lo csv-format.lo rdf-format.lo +-liborg_gnome_save_calendar_la_OBJECTS = \ +- $(am_liborg_gnome_save_calendar_la_OBJECTS) +-liborg_gnome_save_calendar_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_save_calendar_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -117,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -128,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -153,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -186,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -244,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -268,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -292,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -300,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -307,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -316,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -338,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -368,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -387,18 +384,17 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + plugin_DATA = org-gnome-save-calendar.eplug + plugin_LTLIBRARIES = liborg-gnome-save-calendar.la ++ + liborg_gnome_save_calendar_la_SOURCES = \ + save-calendar.c \ + ical-format.c \ +@@ -406,76 +402,89 @@ + rdf-format.c \ + format-handler.h + ++ + liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-save-calendar.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/save-calendar ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_save_calendar_la_LIBADD = ++am_liborg_gnome_save_calendar_la_OBJECTS = save-calendar.lo \ ++ ical-format.lo csv-format.lo rdf-format.lo ++liborg_gnome_save_calendar_la_OBJECTS = \ ++ $(am_liborg_gnome_save_calendar_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/csv-format.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ical-format.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/rdf-format.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/save-calendar.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/save-calendar/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/save-calendar/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-save-calendar.la: $(liborg_gnome_save_calendar_la_OBJECTS) $(liborg_gnome_save_calendar_la_DEPENDENCIES) +- $(liborg_gnome_save_calendar_la_LINK) -rpath $(plugindir) $(liborg_gnome_save_calendar_la_OBJECTS) $(liborg_gnome_save_calendar_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_save_calendar_la_LDFLAGS) $(liborg_gnome_save_calendar_la_OBJECTS) $(liborg_gnome_save_calendar_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -486,49 +495,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-calendar.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -537,7 +571,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -549,11 +582,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -576,23 +608,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -607,10 +644,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -632,7 +668,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -647,34 +683,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -695,23 +721,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/select-one-source/Makefile.in evolution-2.12.2/plugins/select-one-source/Makefile.in +--- evolution-2.12.2.orig/plugins/select-one-source/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/select-one-source/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/select-one-source +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_select_one_source_la_LIBADD = +-am_liborg_gnome_select_one_source_la_OBJECTS = select-one-source.lo +-liborg_gnome_select_one_source_la_OBJECTS = \ +- $(am_liborg_gnome_select_one_source_la_OBJECTS) +-liborg_gnome_select_one_source_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_select_one_source_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,89 +384,96 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) + ++ + plugin_DATA = org-gnome-select-one-source.eplug + plugin_LTLIBRARIES = liborg-gnome-select-one-source.la ++ + liborg_gnome_select_one_source_la_SOURCES = select-one-source.c + liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-select-one-source.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/select-one-source ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_select_one_source_la_LIBADD = ++am_liborg_gnome_select_one_source_la_OBJECTS = select-one-source.lo ++liborg_gnome_select_one_source_la_OBJECTS = \ ++ $(am_liborg_gnome_select_one_source_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/select-one-source.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/select-one-source/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/select-one-source/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-select-one-source.la: $(liborg_gnome_select_one_source_la_OBJECTS) $(liborg_gnome_select_one_source_la_DEPENDENCIES) +- $(liborg_gnome_select_one_source_la_LINK) -rpath $(plugindir) $(liborg_gnome_select_one_source_la_OBJECTS) $(liborg_gnome_select_one_source_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_select_one_source_la_LDFLAGS) $(liborg_gnome_select_one_source_la_OBJECTS) $(liborg_gnome_select_one_source_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -476,49 +481,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-one-source.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -527,7 +557,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,11 +568,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,23 +594,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +630,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -622,7 +654,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +669,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -685,23 +707,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/startup-wizard/Makefile.in evolution-2.12.2/plugins/startup-wizard/Makefile.in +--- evolution-2.12.2.orig/plugins/startup-wizard/Makefile.in 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/startup-wizard/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,67 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/startup-wizard +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-liborg_gnome_evolution_startup_wizard_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/calendar/gui/libevolution-calendar.la \ +- $(top_builddir)/mail/libevolution-mail.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_liborg_gnome_evolution_startup_wizard_la_OBJECTS = \ +- startup-wizard.lo +-liborg_gnome_evolution_startup_wizard_la_OBJECTS = \ +- $(am_liborg_gnome_evolution_startup_wizard_la_OBJECTS) +-liborg_gnome_evolution_startup_wizard_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_evolution_startup_wizard_la_LDFLAGS) $(LDFLAGS) \ +- -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -125,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -136,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -161,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -186,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -194,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -252,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -276,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -300,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -308,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -315,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -324,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -346,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -376,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -395,22 +384,22 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = -I . \ + -I$(top_srcdir) \ + -I$(top_builddir)/shell \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-evolution-startup-wizard.eplug + plugin_LTLIBRARIES = liborg-gnome-evolution-startup-wizard.la ++ + liborg_gnome_evolution_startup_wizard_la_SOURCES = \ + startup-wizard.c + ++ + liborg_gnome_evolution_startup_wizard_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +@@ -420,76 +409,90 @@ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) + ++ + liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) ++ + EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/startup-wizard ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_evolution_startup_wizard_la_DEPENDENCIES = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/calendar/gui/libevolution-calendar.la \ ++ $(top_builddir)/mail/libevolution-mail.la ++am_liborg_gnome_evolution_startup_wizard_la_OBJECTS = startup-wizard.lo ++liborg_gnome_evolution_startup_wizard_la_OBJECTS = \ ++ $(am_liborg_gnome_evolution_startup_wizard_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/startup-wizard.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/startup-wizard/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/startup-wizard/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-evolution-startup-wizard.la: $(liborg_gnome_evolution_startup_wizard_la_OBJECTS) $(liborg_gnome_evolution_startup_wizard_la_DEPENDENCIES) +- $(liborg_gnome_evolution_startup_wizard_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_startup_wizard_la_OBJECTS) $(liborg_gnome_evolution_startup_wizard_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_startup_wizard_la_LDFLAGS) $(liborg_gnome_evolution_startup_wizard_la_OBJECTS) $(liborg_gnome_evolution_startup_wizard_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -497,49 +500,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/startup-wizard.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -548,7 +576,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -560,11 +587,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -587,23 +613,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -618,10 +649,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -643,7 +673,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -658,34 +688,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -706,23 +726,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/subject-thread/Makefile.in evolution-2.12.2/plugins/subject-thread/Makefile.in +--- evolution-2.12.2.orig/plugins/subject-thread/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/subject-thread/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/subject-thread +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_subject_thread_la_LIBADD = +-am_liborg_gnome_subject_thread_la_OBJECTS = subject-thread.lo +-liborg_gnome_subject_thread_la_OBJECTS = \ +- $(am_liborg_gnome_subject_thread_la_OBJECTS) +-liborg_gnome_subject_thread_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_subject_thread_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,89 +384,96 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-subject-thread.eplug + plugin_LTLIBRARIES = liborg-gnome-subject-thread.la ++ + liborg_gnome_subject_thread_la_SOURCES = subject-thread.c + liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version ++ + EXTRA_DIST = org-gnome-subject-thread.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/subject-thread ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_subject_thread_la_LIBADD = ++am_liborg_gnome_subject_thread_la_OBJECTS = subject-thread.lo ++liborg_gnome_subject_thread_la_OBJECTS = \ ++ $(am_liborg_gnome_subject_thread_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/subject-thread.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/subject-thread/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/subject-thread/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-subject-thread.la: $(liborg_gnome_subject_thread_la_OBJECTS) $(liborg_gnome_subject_thread_la_DEPENDENCIES) +- $(liborg_gnome_subject_thread_la_LINK) -rpath $(plugindir) $(liborg_gnome_subject_thread_la_OBJECTS) $(liborg_gnome_subject_thread_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_subject_thread_la_LDFLAGS) $(liborg_gnome_subject_thread_la_OBJECTS) $(liborg_gnome_subject_thread_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -476,49 +481,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subject-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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -527,7 +557,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,11 +568,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -566,23 +594,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -597,10 +630,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -622,7 +654,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -637,34 +669,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -685,23 +707,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/plugins/tnef-attachments/Makefile.in evolution-2.12.2/plugins/tnef-attachments/Makefile.in +--- evolution-2.12.2.orig/plugins/tnef-attachments/Makefile.in 2007-12-05 15:50:04.000000000 +0100 ++++ evolution-2.12.2/plugins/tnef-attachments/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = plugins/tnef-attachments +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +-pluginLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(plugin_LTLIBRARIES) +-liborg_gnome_tnef_attachments_la_LIBADD = +-am_liborg_gnome_tnef_attachments_la_OBJECTS = tnef-plugin.lo +-liborg_gnome_tnef_attachments_la_OBJECTS = \ +- $(am_liborg_gnome_tnef_attachments_la_OBJECTS) +-liborg_gnome_tnef_attachments_la_LINK = $(LIBTOOL) --tag=CC \ +- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +- $(AM_CFLAGS) $(CFLAGS) \ +- $(liborg_gnome_tnef_attachments_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) +-DIST_SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) +-pluginDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(plugin_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -116,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -127,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -152,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -177,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -185,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -243,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -267,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -291,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -299,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -306,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -315,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -337,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -367,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -386,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -398,79 +393,89 @@ + -DLOCALEDIR="\"$(LOCALEDIR)\"" \ + $(EVOLUTION_MAIL_CFLAGS) + ++ + plugin_DATA = org-gnome-tnef-attachments.eplug + plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la ++ + liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c + liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version -lytnef ++ + EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml ++ + BUILT_SOURCES = $(plugin_DATA) + CLEANFILES = $(BUILT_SOURCES) ++subdir = plugins/tnef-attachments ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(plugin_LTLIBRARIES) ++ ++liborg_gnome_tnef_attachments_la_LIBADD = ++am_liborg_gnome_tnef_attachments_la_OBJECTS = tnef-plugin.lo ++liborg_gnome_tnef_attachments_la_OBJECTS = \ ++ $(am_liborg_gnome_tnef_attachments_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tnef-plugin.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) ++DATA = $(plugin_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/tnef-attachments/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/tnef-attachments/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++pluginLTLIBRARIES_INSTALL = $(INSTALL) + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ + else :; fi; \ + done + + uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @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"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ + done + + clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + liborg-gnome-tnef-attachments.la: $(liborg_gnome_tnef_attachments_la_OBJECTS) $(liborg_gnome_tnef_attachments_la_DEPENDENCIES) +- $(liborg_gnome_tnef_attachments_la_LINK) -rpath $(plugindir) $(liborg_gnome_tnef_attachments_la_OBJECTS) $(liborg_gnome_tnef_attachments_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(plugindir) $(liborg_gnome_tnef_attachments_la_LDFLAGS) $(liborg_gnome_tnef_attachments_la_OBJECTS) $(liborg_gnome_tnef_attachments_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -478,49 +483,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnef-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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++pluginDATA_INSTALL = $(INSTALL_DATA) + install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) +- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ +- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ ++ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ + done + + uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ ++ rm -f $(DESTDIR)$(plugindir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -529,7 +559,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -541,11 +570,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -568,23 +596,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -599,10 +632,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -624,7 +656,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -639,34 +671,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-pluginDATA 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 +@@ -687,23 +709,20 @@ + + ps-am: + +-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-pluginDATA \ ++ 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-pluginDATA \ +- install-pluginLTLIBRARIES install-ps install-ps-am \ +- 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 \ ++ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +diff -ruN evolution-2.12.2.orig/shell/Makefile.in evolution-2.12.2/shell/Makefile.in +--- evolution-2.12.2.orig/shell/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/shell/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,16 @@ + + @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 +@@ -34,130 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = evolution$(EXEEXT) +-subdir = shell +-DIST_COMMON = $(eshellinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/evolution-nognome.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = evolution-nognome +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(componentdir)" \ +- "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" \ +- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" \ +- "$(DESTDIR)$(testserverdir)" "$(DESTDIR)$(eshellincludedir)" +-componentLTLIBRARIES_INSTALL = $(INSTALL) +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(component_LTLIBRARIES) $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libeshell_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(am__DEPENDENCIES_1) +-am__objects_1 = +-am__objects_2 = Evolution-common.lo Evolution-skels.lo \ +- Evolution-stubs.lo +-am__objects_3 = $(am__objects_1) $(am__objects_2) +-am__objects_4 = e-shell-marshal.lo +-am_libeshell_la_OBJECTS = $(am__objects_3) $(am__objects_4) \ +- e-component-view.lo evolution-component.lo \ +- evolution-listener.lo e-shell-utils.lo \ +- e-user-creatable-items-handler.lo evolution-config-control.lo \ +- evolution-shell-component-utils.lo $(am__objects_1) +-libeshell_la_OBJECTS = $(am_libeshell_la_OBJECTS) +-libeshell_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libeshell_la_LDFLAGS) $(LDFLAGS) -o $@ +-libevolution_test_la_DEPENDENCIES = libeshell.la $(am__DEPENDENCIES_1) +-am_libevolution_test_la_OBJECTS = $(am__objects_3) \ +- evolution-test-component.lo +-libevolution_test_la_OBJECTS = $(am_libevolution_test_la_OBJECTS) +-libevolution_test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_test_la_LDFLAGS) $(LDFLAGS) -o $@ +-@ENABLE_TEST_COMPONENT_TRUE@am_libevolution_test_la_rpath = -rpath \ +-@ENABLE_TEST_COMPONENT_TRUE@ $(componentdir) +-PROGRAMS = $(noinst_PROGRAMS) +-am__evolution_SOURCES_DIST = Evolution-DataServer-common.c \ +- Evolution-DataServer-skels.c Evolution-DataServer-stubs.c \ +- Evolution-DataServer.h e-shell-nm.c e-shell-nm-glib.c \ +- e-component-registry.c e-component-registry.h \ +- e-config-upgrade.c e-config-upgrade.h e-corba-config-page.c \ +- e-corba-config-page.h e-history.c e-history.h e-shell.c \ +- e-shell.h e-shell-constants.h e-shell-folder-title-bar.c \ +- e-shell-folder-title-bar.h e-shell-importer.c \ +- e-shell-importer.h e-shell-settings-dialog.c \ +- e-shell-settings-dialog.h e-shell-window-commands.c \ +- e-shell-window-commands.h e-shell-window.c e-shell-window.h \ +- e-shell-view.c e-shell-view.h e-sidebar.c e-sidebar.h \ +- es-event.c es-menu.c main.c +-am__objects_5 = Evolution-DataServer-common.$(OBJEXT) \ +- Evolution-DataServer-skels.$(OBJEXT) \ +- Evolution-DataServer-stubs.$(OBJEXT) +-am__objects_6 = $(am__objects_5) $(am__objects_1) +-@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@am__objects_7 = \ +-@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@ e-shell-nm.$(OBJEXT) +-@NM_SUPPORT_GLIB_TRUE@am__objects_7 = e-shell-nm-glib.$(OBJEXT) +-am_evolution_OBJECTS = $(am__objects_6) $(am__objects_7) \ +- e-component-registry.$(OBJEXT) e-config-upgrade.$(OBJEXT) \ +- e-corba-config-page.$(OBJEXT) e-history.$(OBJEXT) \ +- e-shell.$(OBJEXT) e-shell-folder-title-bar.$(OBJEXT) \ +- e-shell-importer.$(OBJEXT) e-shell-settings-dialog.$(OBJEXT) \ +- e-shell-window-commands.$(OBJEXT) e-shell-window.$(OBJEXT) \ +- e-shell-view.$(OBJEXT) e-sidebar.$(OBJEXT) es-event.$(OBJEXT) \ +- es-menu.$(OBJEXT) main.$(OBJEXT) +-evolution_OBJECTS = $(am_evolution_OBJECTS) +-evolution_DEPENDENCIES = libeshell.la \ +- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-SCRIPTS = $(noinst_SCRIPTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) \ +- $(evolution_SOURCES) +-DIST_SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) \ +- $(am__evolution_SOURCES_DIST) +-errorDATA_INSTALL = $(INSTALL_DATA) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-idlDATA_INSTALL = $(INSTALL_DATA) +-schemaDATA_INSTALL = $(INSTALL_DATA) +-serverDATA_INSTALL = $(INSTALL_DATA) +-testserverDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(error_DATA) $(glade_DATA) $(idl_DATA) $(schema_DATA) \ +- $(server_DATA) $(testserver_DATA) +-eshellincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(eshellinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -191,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -202,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -227,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -252,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -260,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -318,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -342,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -366,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -374,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -381,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -390,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -412,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -442,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -461,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir)/widgets \ +@@ -490,6 +410,9 @@ + $(EVOLUTION_TEST_CFLAGS) + + ++noinst_PROGRAMS = evolution ++ ++ + # Shell CORBA stuff + IDLS = \ + Evolution-ConfigControl.idl \ +@@ -497,40 +420,51 @@ + Evolution-Shell.idl \ + Evolution.idl + ++ + IDL_GENERATED_H = \ + Evolution.h + ++ + IDL_GENERATED_C = \ + Evolution-common.c \ + Evolution-skels.c \ + Evolution-stubs.c + ++ + idl_defines = \ + -D__evolution_shell_COMPILATION + ++ + IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C) +-@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@NM_SUPPORT_FILES = e-shell-nm.c ++ + @NM_SUPPORT_GLIB_TRUE@NM_SUPPORT_FILES = e-shell-nm-glib.c ++@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@NM_SUPPORT_FILES = e-shell-nm.c + + # Data Server CORBA stuff + DATASERVER_IDL_GENERATED_H = \ + Evolution-DataServer.h + ++ + DATASERVER_IDL_GENERATED_C = \ + Evolution-DataServer-common.c \ + Evolution-DataServer-skels.c \ + Evolution-DataServer-stubs.c + ++ + DATASERVER_IDL_GENERATED = $(DATASERVER_IDL_GENERATED_C) $(DATASERVER_IDL_GENERATED_H) + ++ + # IDL install + idl_DATA = $(IDLS) + ++ + # Shell library + privsolib_LTLIBRARIES = \ + libeshell.la + ++ + eshellincludedir = $(privincludedir)/shell ++ + eshellinclude_HEADERS = \ + Evolution.h \ + e-component-view.h \ +@@ -543,6 +477,7 @@ + es-event.h \ + es-menu.h + ++ + libeshell_la_SOURCES = \ + $(IDL_GENERATED) \ + $(MARSHAL_GENERATED) \ +@@ -555,13 +490,16 @@ + evolution-shell-component-utils.c \ + $(eshellinclude_HEADERS) + ++ + libeshell_la_LDFLAGS = $(NO_UNDEFINED) ++ + libeshell_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(SHELL_LIBS) + + ++ + # Evolution executable + evolution_SOURCES = \ + $(DATASERVER_IDL_GENERATED) \ +@@ -595,6 +533,7 @@ + es-menu.c \ + main.c + ++ + evolution_LDADD = \ + libeshell.la \ + $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +@@ -604,38 +543,49 @@ + $(SHELL_LIBS) + + ++ + # Test component + @ENABLE_TEST_COMPONENT_TRUE@component_LTLIBRARIES = libevolution-test.la ++ + libevolution_test_la_SOURCES = \ + $(IDL_GENERATED) \ + evolution-test-component.c \ + evolution-test-component.h + ++ + libevolution_test_la_LIBADD = \ + libeshell.la \ + $(EVOLUTION_TEST_LIBS) + ++ + libevolution_test_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++ + @ENABLE_TEST_COMPONENT_TRUE@testserver_in_files = GNOME_Evolution_Test.server.in.in + @ENABLE_TEST_COMPONENT_TRUE@testserver_DATA = $(testserver_in_files:.server.in.in=.server) + @ENABLE_TEST_COMPONENT_TRUE@testserverdir = $(serverdir) + ++ + # Misc stuff + server_in_files = GNOME_Evolution_Shell.server.in.in + server_DATA = $(server_in_files:.server.in.in=.server) ++ + error_DATA = shell.error + errordir = $(privdatadir)/errors ++ + glade_DATA = \ + e-active-connection-dialog.glade \ + import.glade + + ++ + # GConf schemas + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_in_files = apps_evolution_shell.schemas.in + schema_DATA = $(schema_in_files:.schemas.in=.schemas) ++ + MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h + ++ + # Extra dist stuff + EXTRA_DIST = \ + $(IDLS) \ +@@ -649,106 +599,203 @@ + evolution-nognome.in + + ++ + # Purify support + @ENABLE_PURIFY_TRUE@PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ++ + BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) + CLEANFILES = $(BUILT_SOURCES) ++ + DISTCLEANFILES = $(schema_DATA) ++ + noinst_SCRIPTS = evolution-nognome ++subdir = shell ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = evolution-nognome ++LTLIBRARIES = $(component_LTLIBRARIES) $(privsolib_LTLIBRARIES) ++ ++libeshell_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la ++am__objects_1 = ++am__objects_2 = Evolution-common.lo Evolution-skels.lo \ ++ Evolution-stubs.lo ++am__objects_3 = $(am__objects_1) $(am__objects_2) ++am__objects_4 = e-shell-marshal.lo ++am_libeshell_la_OBJECTS = $(am__objects_3) $(am__objects_4) \ ++ e-component-view.lo evolution-component.lo \ ++ evolution-listener.lo e-shell-utils.lo \ ++ e-user-creatable-items-handler.lo evolution-config-control.lo \ ++ evolution-shell-component-utils.lo $(am__objects_1) ++libeshell_la_OBJECTS = $(am_libeshell_la_OBJECTS) ++libevolution_test_la_DEPENDENCIES = libeshell.la ++am_libevolution_test_la_OBJECTS = $(am__objects_3) \ ++ evolution-test-component.lo ++libevolution_test_la_OBJECTS = $(am_libevolution_test_la_OBJECTS) ++noinst_PROGRAMS = evolution$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++ ++am__evolution_SOURCES_DIST = Evolution-DataServer-common.c \ ++ Evolution-DataServer-skels.c Evolution-DataServer-stubs.c \ ++ Evolution-DataServer.h e-shell-nm-glib.c e-shell-nm.c \ ++ e-component-registry.c e-component-registry.h \ ++ e-config-upgrade.c e-config-upgrade.h e-corba-config-page.c \ ++ e-corba-config-page.h e-history.c e-history.h e-shell.c \ ++ e-shell.h e-shell-constants.h e-shell-folder-title-bar.c \ ++ e-shell-folder-title-bar.h e-shell-importer.c \ ++ e-shell-importer.h e-shell-settings-dialog.c \ ++ e-shell-settings-dialog.h e-shell-window-commands.c \ ++ e-shell-window-commands.h e-shell-window.c e-shell-window.h \ ++ e-shell-view.c e-shell-view.h e-sidebar.c e-sidebar.h \ ++ es-event.c es-menu.c main.c ++am__objects_5 = Evolution-DataServer-common.$(OBJEXT) \ ++ Evolution-DataServer-skels.$(OBJEXT) \ ++ Evolution-DataServer-stubs.$(OBJEXT) ++am__objects_6 = $(am__objects_5) $(am__objects_1) ++@NM_SUPPORT_GLIB_TRUE@am__objects_7 = e-shell-nm-glib.$(OBJEXT) ++@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@am__objects_7 = \ ++@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@ e-shell-nm.$(OBJEXT) ++am_evolution_OBJECTS = $(am__objects_6) $(am__objects_7) \ ++ e-component-registry.$(OBJEXT) e-config-upgrade.$(OBJEXT) \ ++ e-corba-config-page.$(OBJEXT) e-history.$(OBJEXT) \ ++ e-shell.$(OBJEXT) e-shell-folder-title-bar.$(OBJEXT) \ ++ e-shell-importer.$(OBJEXT) e-shell-settings-dialog.$(OBJEXT) \ ++ e-shell-window-commands.$(OBJEXT) e-shell-window.$(OBJEXT) \ ++ e-shell-view.$(OBJEXT) e-sidebar.$(OBJEXT) es-event.$(OBJEXT) \ ++ es-menu.$(OBJEXT) main.$(OBJEXT) ++evolution_OBJECTS = $(am_evolution_OBJECTS) ++evolution_DEPENDENCIES = libeshell.la \ ++ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++evolution_LDFLAGS = ++SCRIPTS = $(noinst_SCRIPTS) ++ ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-DataServer-common.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-skels.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-stubs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-component-registry.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-component-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-config-upgrade.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-corba-config-page.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-history.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-folder-title-bar.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-importer.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-nm-glib.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-nm.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-settings-dialog.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-view.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-window-commands.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-window.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-shell.Po ./$(DEPDIR)/e-sidebar.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-user-creatable-items-handler.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/es-event.Po ./$(DEPDIR)/es-menu.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-config-control.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-listener.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-shell-component-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/evolution-test-component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) \ ++ $(am__evolution_SOURCES_DIST) ++DATA = $(error_DATA) $(glade_DATA) $(idl_DATA) $(schema_DATA) \ ++ $(server_DATA) $(testserver_DATA) ++ ++HEADERS = $(eshellinclude_HEADERS) ++ ++DIST_COMMON = $(eshellinclude_HEADERS) $(srcdir)/Makefile.in ChangeLog \ ++ Makefile.am evolution-nognome.in ++SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) $(evolution_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu shell/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu shell/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-evolution-nognome: $(top_builddir)/config.status $(srcdir)/evolution-nognome.in ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++evolution-nognome: $(top_builddir)/config.status evolution-nognome.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ++componentLTLIBRARIES_INSTALL = $(INSTALL) + install-componentLTLIBRARIES: $(component_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ + else :; fi; \ + done + + uninstall-componentLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ + done + + clean-componentLTLIBRARIES: + -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) + @list='$(component_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libeshell.la: $(libeshell_la_OBJECTS) $(libeshell_la_DEPENDENCIES) +- $(libeshell_la_LINK) -rpath $(privsolibdir) $(libeshell_la_OBJECTS) $(libeshell_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libeshell_la_LDFLAGS) $(libeshell_la_OBJECTS) $(libeshell_la_LIBADD) $(LIBS) + libevolution-test.la: $(libevolution_test_la_OBJECTS) $(libevolution_test_la_DEPENDENCIES) +- $(libevolution_test_la_LINK) $(am_libevolution_test_la_rpath) $(libevolution_test_la_OBJECTS) $(libevolution_test_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(componentdir) $(libevolution_test_la_LDFLAGS) $(libevolution_test_la_OBJECTS) $(libevolution_test_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -758,10 +805,10 @@ + done + evolution$(EXEEXT): $(evolution_OBJECTS) $(evolution_DEPENDENCIES) + @rm -f evolution$(EXEEXT) +- $(LINK) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS) ++ $(LINK) $(evolution_LDFLAGS) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -800,151 +847,182 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++errorDATA_INSTALL = $(INSTALL_DATA) + install-errorDATA: $(error_DATA) + @$(NORMAL_INSTALL) +- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" ++ $(mkinstalldirs) $(DESTDIR)$(errordir) + @list='$(error_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ +- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ ++ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ + done + + uninstall-errorDATA: + @$(NORMAL_UNINSTALL) + @list='$(error_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ +- rm -f "$(DESTDIR)$(errordir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ ++ rm -f $(DESTDIR)$(errordir)/$$f; \ + done ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++idlDATA_INSTALL = $(INSTALL_DATA) + install-idlDATA: $(idl_DATA) + @$(NORMAL_INSTALL) +- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" ++ $(mkinstalldirs) $(DESTDIR)$(idldir) + @list='$(idl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ +- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ ++ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ + done + + uninstall-idlDATA: + @$(NORMAL_UNINSTALL) + @list='$(idl_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ +- rm -f "$(DESTDIR)$(idldir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ ++ rm -f $(DESTDIR)$(idldir)/$$f; \ + done ++schemaDATA_INSTALL = $(INSTALL_DATA) + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" ++ $(mkinstalldirs) $(DESTDIR)$(schemadir) + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ +- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ++ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ +- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ++ rm -f $(DESTDIR)$(schemadir)/$$f; \ + done ++serverDATA_INSTALL = $(INSTALL_DATA) + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" ++ $(mkinstalldirs) $(DESTDIR)$(serverdir) + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ +- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ ++ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ + done + + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ++ rm -f $(DESTDIR)$(serverdir)/$$f; \ + done ++testserverDATA_INSTALL = $(INSTALL_DATA) + install-testserverDATA: $(testserver_DATA) + @$(NORMAL_INSTALL) +- test -z "$(testserverdir)" || $(MKDIR_P) "$(DESTDIR)$(testserverdir)" ++ $(mkinstalldirs) $(DESTDIR)$(testserverdir) + @list='$(testserver_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(testserverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(testserverdir)/$$f'"; \ +- $(testserverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(testserverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(testserverDATA_INSTALL) $$d$$p $(DESTDIR)$(testserverdir)/$$f"; \ ++ $(testserverDATA_INSTALL) $$d$$p $(DESTDIR)$(testserverdir)/$$f; \ + done + + uninstall-testserverDATA: + @$(NORMAL_UNINSTALL) + @list='$(testserver_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(testserverdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(testserverdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(testserverdir)/$$f"; \ ++ rm -f $(DESTDIR)$(testserverdir)/$$f; \ + done ++eshellincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-eshellincludeHEADERS: $(eshellinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(eshellincludedir)" || $(MKDIR_P) "$(DESTDIR)$(eshellincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(eshellincludedir) + @list='$(eshellinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(eshellincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eshellincludedir)/$$f'"; \ +- $(eshellincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eshellincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(eshellincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eshellincludedir)/$$f"; \ ++ $(eshellincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eshellincludedir)/$$f; \ + done + + uninstall-eshellincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(eshellinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(eshellincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(eshellincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(eshellincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(eshellincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -953,7 +1031,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -965,11 +1042,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -992,23 +1068,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -1025,13 +1106,11 @@ + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +-@ENABLE_PURIFY_FALSE@all-local: + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ + $(HEADERS) all-local ++ + installdirs: +- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(testserverdir)" "$(DESTDIR)$(eshellincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) $(DESTDIR)$(idldir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) $(DESTDIR)$(testserverdir) $(DESTDIR)$(eshellincludedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -1053,7 +1132,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -1069,14 +1148,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -1086,20 +1163,12 @@ + install-gladeDATA install-idlDATA install-privsolibLTLIBRARIES \ + install-schemaDATA install-serverDATA install-testserverDATA + +-install-dvi: install-dvi-am +- + install-exec-am: install-exec-local + +-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 +@@ -1122,35 +1191,31 @@ + + uninstall-am: uninstall-componentLTLIBRARIES uninstall-errorDATA \ + uninstall-eshellincludeHEADERS uninstall-gladeDATA \ +- uninstall-idlDATA uninstall-local \ ++ uninstall-idlDATA uninstall-info-am uninstall-local \ + uninstall-privsolibLTLIBRARIES uninstall-schemaDATA \ + uninstall-serverDATA uninstall-testserverDATA + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-componentLTLIBRARIES clean-generic clean-libtool \ +- clean-noinstPROGRAMS clean-privsolibLTLIBRARIES ctags \ +- dist-hook distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am \ +- install-componentLTLIBRARIES install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ +- install-errorDATA install-eshellincludeHEADERS install-exec \ +- install-exec-am install-exec-local install-gladeDATA \ +- install-html install-html-am install-idlDATA install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ +- install-schemaDATA install-serverDATA install-strip \ +- install-testserverDATA 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-componentLTLIBRARIES \ ++ clean-noinstPROGRAMS clean-privsolibLTLIBRARIES ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-componentLTLIBRARIES install-data \ ++ install-data-am install-data-local install-errorDATA \ ++ install-eshellincludeHEADERS install-exec install-exec-am \ ++ install-exec-local install-gladeDATA install-idlDATA \ ++ install-info install-info-am install-man \ ++ install-privsolibLTLIBRARIES install-schemaDATA \ ++ install-serverDATA install-strip install-testserverDATA \ ++ 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-componentLTLIBRARIES \ + uninstall-errorDATA uninstall-eshellincludeHEADERS \ +- uninstall-gladeDATA uninstall-idlDATA uninstall-local \ +- uninstall-privsolibLTLIBRARIES uninstall-schemaDATA \ +- uninstall-serverDATA uninstall-testserverDATA ++ uninstall-gladeDATA uninstall-idlDATA uninstall-info-am \ ++ uninstall-local uninstall-privsolibLTLIBRARIES \ ++ uninstall-schemaDATA uninstall-serverDATA \ ++ uninstall-testserverDATA + + + $(IDL_GENERATED_H): $(IDLS) +diff -ruN evolution-2.12.2.orig/smime/gui/Makefile.in evolution-2.12.2/smime/gui/Makefile.in +--- evolution-2.12.2.orig/smime/gui/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/smime/gui/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,62 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = smime/gui +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libevolution_smime_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/shell/libeshell.la \ +- $(top_builddir)/smime/lib/libessmime.la $(am__DEPENDENCIES_1) +-am_libevolution_smime_la_OBJECTS = ca-trust-dialog.lo \ +- cert-trust-dialog.lo certificate-manager.lo \ +- certificate-viewer.lo e-cert-selector.lo component.lo +-libevolution_smime_la_OBJECTS = $(am_libevolution_smime_la_OBJECTS) +-libevolution_smime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libevolution_smime_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libevolution_smime_la_SOURCES) +-DIST_SOURCES = $(libevolution_smime_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -120,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -131,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -156,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -181,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -189,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -247,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -271,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -295,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -303,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -310,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -319,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -341,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -371,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -390,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-smime\" \ +@@ -414,7 +405,9 @@ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(CERT_UI_CFLAGS) + ++ + privsolib_LTLIBRARIES = libevolution-smime.la ++ + libevolution_smime_la_SOURCES = \ + ca-trust-dialog.c \ + ca-trust-dialog.h \ +@@ -429,82 +422,100 @@ + component.c \ + component.h + ++ + libevolution_smime_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/smime/lib/libessmime.la \ + $(CERT_UI_LIBS) + ++ + libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) ++ + glade_DATA = smime-ui.glade ++ + EXTRA_DIST = \ + $(glade_DATA) + ++subdir = smime/gui ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libevolution_smime_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ ++ $(top_builddir)/smime/lib/libessmime.la ++am_libevolution_smime_la_OBJECTS = ca-trust-dialog.lo \ ++ cert-trust-dialog.lo certificate-manager.lo \ ++ certificate-viewer.lo e-cert-selector.lo component.lo ++libevolution_smime_la_OBJECTS = $(am_libevolution_smime_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ca-trust-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cert-trust-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/certificate-manager.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/certificate-viewer.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/component.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cert-selector.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libevolution_smime_la_SOURCES) ++DATA = $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libevolution_smime_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu smime/gui/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu smime/gui/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libevolution-smime.la: $(libevolution_smime_la_OBJECTS) $(libevolution_smime_la_DEPENDENCIES) +- $(libevolution_smime_la_LINK) -rpath $(privsolibdir) $(libevolution_smime_la_OBJECTS) $(libevolution_smime_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libevolution_smime_la_LDFLAGS) $(libevolution_smime_la_OBJECTS) $(libevolution_smime_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -517,49 +528,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-cert-selector.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -568,7 +604,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -580,11 +615,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -607,23 +641,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -637,10 +676,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -660,7 +698,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -674,34 +712,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-gladeDATA install-privsolibLTLIBRARIES + +-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 +@@ -722,24 +750,21 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ +- 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-gladeDATA uninstall-privsolibLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-privsolibLTLIBRARIES 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-gladeDATA \ ++ uninstall-info-am uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/smime/lib/Makefile.in evolution-2.12.2/smime/lib/Makefile.in +--- evolution-2.12.2.orig/smime/lib/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/smime/lib/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,58 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = smime/lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libessmime_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(am__DEPENDENCIES_1) +-am__objects_1 = smime-marshal.lo +-am_libessmime_la_OBJECTS = $(am__objects_1) e-asn1-object.lo e-cert.lo \ +- e-cert-trust.lo e-cert-db.lo e-pkcs12.lo +-libessmime_la_OBJECTS = $(am_libessmime_la_OBJECTS) +-libessmime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libessmime_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libessmime_la_SOURCES) +-DIST_SOURCES = $(libessmime_la_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -115,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -126,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -151,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -176,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -184,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -242,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -266,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -290,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -298,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -305,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -314,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -336,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -366,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -385,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-smime\" \ +@@ -406,7 +402,9 @@ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(CERT_UI_CFLAGS) + ++ + privsolib_LTLIBRARIES = libessmime.la ++ + libessmime_la_SOURCES = \ + $(MARSHAL_GENERATED) \ + e-asn1-object.c \ +@@ -420,81 +418,95 @@ + e-pkcs12.c \ + e-pkcs12.h + ++ + libessmime_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(CERT_UI_LIBS) + ++ + libessmime_la_LDFLAGS = $(NO_UNDEFINED) ++ + MARSHAL_GENERATED = smime-marshal.c smime-marshal.h ++ + BUILT_SOURCES = $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) ++ + EXTRA_DIST = smime-marshal.list ++subdir = smime/lib ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libessmime_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la ++am__objects_1 = smime-marshal.lo ++am_libessmime_la_OBJECTS = $(am__objects_1) e-asn1-object.lo e-cert.lo \ ++ e-cert-trust.lo e-cert-db.lo e-pkcs12.lo ++libessmime_la_OBJECTS = $(am_libessmime_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-asn1-object.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cert-db.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cert-trust.Plo ./$(DEPDIR)/e-cert.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-pkcs12.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/smime-marshal.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libessmime_la_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libessmime_la_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu smime/lib/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu smime/lib/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libessmime.la: $(libessmime_la_OBJECTS) $(libessmime_la_DEPENDENCIES) +- $(libessmime_la_LINK) -rpath $(privsolibdir) $(libessmime_la_OBJECTS) $(libessmime_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libessmime_la_LDFLAGS) $(libessmime_la_OBJECTS) $(libessmime_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -507,25 +519,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime-marshal.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -533,6 +557,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -541,7 +577,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -553,11 +588,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -580,23 +614,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -611,10 +650,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -636,7 +674,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -651,34 +689,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-privsolibLTLIBRARIES + +-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 +@@ -699,23 +727,20 @@ + + ps-am: + +-uninstall-am: uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + @EVO_MARSHAL_RULE@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -ruN evolution-2.12.2.orig/smime/Makefile.in evolution-2.12.2/smime/Makefile.in +--- evolution-2.12.2.orig/smime/Makefile.in 2007-12-05 15:50:06.000000000 +0100 ++++ evolution-2.12.2/smime/Makefile.in 2007-12-05 15:55:02.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = smime +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,45 +384,32 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = lib gui ++subdir = smime ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu smime/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu smime/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -409,6 +417,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, +@@ -416,13 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -434,20 +440,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -468,7 +469,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -479,6 +480,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -487,22 +496,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -512,11 +518,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -539,23 +544,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -566,19 +576,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -588,6 +594,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -607,7 +614,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -618,34 +625,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -664,24 +662,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/tools/Makefile.in evolution-2.12.2/tools/Makefile.in +--- evolution-2.12.2.orig/tools/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/tools/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,49 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-privlibexec_PROGRAMS = $(am__EXEEXT_1) +-subdir = tools +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@OS_WIN32_FALSE@am__EXEEXT_1 = killev$(EXEEXT) +-am__installdirs = "$(DESTDIR)$(privlibexecdir)" +-privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(privlibexec_PROGRAMS) +-am_killev_OBJECTS = killev.$(OBJEXT) +-killev_OBJECTS = $(am_killev_OBJECTS) +-am__DEPENDENCIES_1 = +-killev_DEPENDENCIES = $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(killev_SOURCES) +-DIST_SOURCES = $(killev_SOURCES) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -106,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -117,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -142,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -167,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -175,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -233,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -257,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -281,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -289,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -296,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -305,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -327,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -357,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -376,15 +384,17 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_FALSE@PLATFORM_DEP_TOOLS = \ + @OS_WIN32_FALSE@ killev + ++ ++privlibexec_PROGRAMS = \ ++ $(PLATFORM_DEP_TOOLS) ++ ++ + INCLUDES = \ + -DG_LOG_DOMAIN=\"evolution-tools\" \ + -I$(top_srcdir) \ +@@ -396,71 +406,85 @@ + -DLIBDIR=\""$(libdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) + ++ + EXTRA_DIST = verify-evolution-install.sh ++ + CORBA_SOURCE = \ + Evolution-Composer.h \ + Evolution-Composer-common.c \ + Evolution-Composer-skels.c \ + Evolution-Composer-stubs.c + ++ + BUILT_SOURCES = $(CORBA_SOURCE) ++ + idls = \ + $(top_srcdir)/composer/Evolution-Composer.idl + ++ + killev_SOURCES = \ + killev.c + ++ + killev_LDADD = \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(E_UTIL_LIBS) + ++ + CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES) ++subdir = tools ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++@OS_WIN32_TRUE@privlibexec_PROGRAMS = ++@OS_WIN32_FALSE@privlibexec_PROGRAMS = killev$(EXEEXT) ++PROGRAMS = $(privlibexec_PROGRAMS) ++ ++am_killev_OBJECTS = killev.$(OBJEXT) ++killev_OBJECTS = $(am_killev_OBJECTS) ++killev_DEPENDENCIES = $(top_builddir)/widgets/misc/libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++killev_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/killev.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(killev_SOURCES) ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(killev_SOURCES) ++ + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu tools/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ + else :; fi; \ + done + +@@ -468,8 +492,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ ++ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ ++ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ + done + + clean-privlibexecPROGRAMS: +@@ -480,10 +504,10 @@ + done + killev$(EXEEXT): $(killev_OBJECTS) $(killev_DEPENDENCIES) + @rm -f killev$(EXEEXT) +- $(LINK) $(killev_OBJECTS) $(killev_LDADD) $(LIBS) ++ $(LINK) $(killev_LDFLAGS) $(killev_OBJECTS) $(killev_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -491,25 +515,37 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/killev.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo +@@ -517,6 +553,18 @@ + clean-libtool: + -rm -rf .libs _libs + ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -525,7 +573,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -537,11 +584,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -564,23 +610,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -595,10 +646,9 @@ + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(PROGRAMS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privlibexecdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -620,7 +670,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -635,34 +685,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: install-privlibexecPROGRAMS + +-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 +@@ -683,23 +723,20 @@ + + ps-am: + +-uninstall-am: uninstall-privlibexecPROGRAMS +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-privlibexecPROGRAMS + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privlibexecPROGRAMS 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-privlibexecPROGRAMS \ +- install-ps install-ps-am install-strip installcheck \ ++ distclean-tags distdir dvi dvi-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-privlibexecPROGRAMS 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-privlibexecPROGRAMS ++ tags uninstall uninstall-am uninstall-info-am \ ++ uninstall-privlibexecPROGRAMS + + + $(CORBA_SOURCE): $(idls) +diff -ruN evolution-2.12.2.orig/ui/Makefile.in evolution-2.12.2/ui/Makefile.in +--- evolution-2.12.2.orig/ui/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/ui/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = ui +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(evolutionuidir)" +-evolutionuiDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(evolutionui_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + XML_FILES = \ + evolution.xml \ +@@ -386,65 +406,57 @@ + evolution-editor.xml \ + evolution-tasks.xml + ++ + evolutionui_DATA = $(XML_FILES) ++ + EXTRA_DIST = \ + $(XML_FILES) \ + ChangeLog.pre-1-4 + ++subdir = ui ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(evolutionui_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ui/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu ui/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++evolutionuiDATA_INSTALL = $(INSTALL_DATA) + install-evolutionuiDATA: $(evolutionui_DATA) + @$(NORMAL_INSTALL) +- test -z "$(evolutionuidir)" || $(MKDIR_P) "$(DESTDIR)$(evolutionuidir)" ++ $(mkinstalldirs) $(DESTDIR)$(evolutionuidir) + @list='$(evolutionui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(evolutionuiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(evolutionuidir)/$$f'"; \ +- $(evolutionuiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(evolutionuidir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(evolutionuiDATA_INSTALL) $$d$$p $(DESTDIR)$(evolutionuidir)/$$f"; \ ++ $(evolutionuiDATA_INSTALL) $$d$$p $(DESTDIR)$(evolutionuidir)/$$f; \ + done + + uninstall-evolutionuiDATA: + @$(NORMAL_UNINSTALL) + @list='$(evolutionui_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(evolutionuidir)/$$f'"; \ +- rm -f "$(DESTDIR)$(evolutionuidir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(evolutionuidir)/$$f"; \ ++ rm -f $(DESTDIR)$(evolutionuidir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -452,23 +464,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -482,10 +499,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(evolutionuidir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(evolutionuidir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -505,7 +521,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -516,34 +532,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-evolutionuiDATA + +-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 +@@ -562,21 +568,18 @@ + + ps-am: + +-uninstall-am: uninstall-evolutionuiDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-evolutionuiDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-evolutionuiDATA install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-evolutionuiDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-evolutionuiDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-evolutionuiDATA \ ++ 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 -ruN evolution-2.12.2.orig/views/addressbook/Makefile.in evolution-2.12.2/views/addressbook/Makefile.in +--- evolution-2.12.2.orig/views/addressbook/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/views/addressbook/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = views/addressbook +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(addressviewsdir)" +-addressviewsDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(addressviews_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,69 +384,56 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + addressviewsdir = $(viewsdir)/addressbook + addressviews_DATA = Address_Cards.galview By_Company.galview Phone_List.galview galview.xml + EXTRA_DIST = $(addressviews_DATA) ++subdir = views/addressbook ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(addressviews_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/addressbook/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu views/addressbook/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++addressviewsDATA_INSTALL = $(INSTALL_DATA) + install-addressviewsDATA: $(addressviews_DATA) + @$(NORMAL_INSTALL) +- test -z "$(addressviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(addressviewsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(addressviewsdir) + @list='$(addressviews_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(addressviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addressviewsdir)/$$f'"; \ +- $(addressviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addressviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(addressviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(addressviewsdir)/$$f"; \ ++ $(addressviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(addressviewsdir)/$$f; \ + done + + uninstall-addressviewsDATA: + @$(NORMAL_UNINSTALL) + @list='$(addressviews_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(addressviewsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(addressviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(addressviewsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(addressviewsdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -431,23 +441,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +476,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(addressviewsdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(addressviewsdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -484,7 +498,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -495,34 +509,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-addressviewsDATA + +-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 +@@ -541,22 +545,17 @@ + + ps-am: + +-uninstall-am: uninstall-addressviewsDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-addressviewsDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install \ +- install-addressviewsDATA 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 \ +- installcheck-am installdirs maintainer-clean \ ++ dvi-am info info-am install install-addressviewsDATA 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-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall \ +- uninstall-addressviewsDATA uninstall-am ++ uninstall-addressviewsDATA 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 -ruN evolution-2.12.2.orig/views/calendar/Makefile.in evolution-2.12.2/views/calendar/Makefile.in +--- evolution-2.12.2.orig/views/calendar/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/views/calendar/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = views/calendar +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(calendarviewsdir)" +-calendarviewsDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(calendarviews_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,69 +384,58 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + calendarviewsdir = $(viewsdir)/calendar ++ + calendarviews_DATA = List_View.galview galview.xml ++ + EXTRA_DIST = $(calendarviews_DATA) ++subdir = views/calendar ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(calendarviews_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/calendar/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu views/calendar/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++calendarviewsDATA_INSTALL = $(INSTALL_DATA) + install-calendarviewsDATA: $(calendarviews_DATA) + @$(NORMAL_INSTALL) +- test -z "$(calendarviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(calendarviewsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(calendarviewsdir) + @list='$(calendarviews_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(calendarviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(calendarviewsdir)/$$f'"; \ +- $(calendarviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(calendarviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(calendarviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(calendarviewsdir)/$$f"; \ ++ $(calendarviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(calendarviewsdir)/$$f; \ + done + + uninstall-calendarviewsDATA: + @$(NORMAL_UNINSTALL) + @list='$(calendarviews_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(calendarviewsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(calendarviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(calendarviewsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(calendarviewsdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -431,23 +443,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +478,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(calendarviewsdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(calendarviewsdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -484,7 +500,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -495,34 +511,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-calendarviewsDATA + +-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 +@@ -541,21 +547,18 @@ + + ps-am: + +-uninstall-am: uninstall-calendarviewsDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-calendarviewsDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ ++ dvi-am info info-am install install-am \ + install-calendarviewsDATA install-data install-data-am \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ ++ 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-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-calendarviewsDATA ++ ps ps-am uninstall uninstall-am uninstall-calendarviewsDATA \ ++ 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 -ruN evolution-2.12.2.orig/views/mail/Makefile.in evolution-2.12.2/views/mail/Makefile.in +--- evolution-2.12.2.orig/views/mail/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/views/mail/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = views/mail +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(mailviewsdir)" +-mailviewsDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(mailviews_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,69 +384,56 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + mailviewsdir = $(viewsdir)/mail + mailviews_DATA = As_Sent_Folder.galview By_Sender.galview By_Status.galview By_Subject.galview Messages.galview By_Follow_Up_Flag.galview galview.xml Wide_View_Normal.galview Wide_View_Sent.galview + EXTRA_DIST = $(mailviews_DATA) ++subdir = views/mail ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(mailviews_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/mail/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu views/mail/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++mailviewsDATA_INSTALL = $(INSTALL_DATA) + install-mailviewsDATA: $(mailviews_DATA) + @$(NORMAL_INSTALL) +- test -z "$(mailviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(mailviewsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(mailviewsdir) + @list='$(mailviews_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(mailviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mailviewsdir)/$$f'"; \ +- $(mailviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mailviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(mailviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(mailviewsdir)/$$f"; \ ++ $(mailviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(mailviewsdir)/$$f; \ + done + + uninstall-mailviewsDATA: + @$(NORMAL_UNINSTALL) + @list='$(mailviews_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(mailviewsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(mailviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(mailviewsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(mailviewsdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -431,23 +441,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +476,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(mailviewsdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(mailviewsdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -484,7 +498,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -495,34 +509,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-mailviewsDATA + +-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 +@@ -541,21 +545,17 @@ + + ps-am: + +-uninstall-am: uninstall-mailviewsDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-mailviewsDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-mailviewsDATA install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-mailviewsDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-info \ ++ install-info-am install-mailviewsDATA install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-mailviewsDATA + + # 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 -ruN evolution-2.12.2.orig/views/Makefile.in evolution-2.12.2/views/Makefile.in +--- evolution-2.12.2.orig/views/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/views/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = views +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,46 +384,34 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + SUBDIRS = addressbook mail tasks calendar memos ++ + EXTRA_DIST = ChangeLog.pre-1-4 ++subdir = views ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu views/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -410,6 +419,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, +@@ -417,13 +430,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -435,20 +442,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -469,7 +471,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -480,6 +482,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -488,22 +498,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -513,11 +520,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -540,23 +546,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -567,19 +578,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -589,6 +596,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -608,7 +616,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -619,34 +627,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -665,24 +664,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/views/memos/Makefile.in evolution-2.12.2/views/memos/Makefile.in +--- evolution-2.12.2.orig/views/memos/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/views/memos/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = views/memos +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(memosviewsdir)" +-memosviewsDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(memosviews_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,69 +384,56 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + memosviewsdir = $(viewsdir)/memos + memosviews_DATA = Memos.galview galview.xml + EXTRA_DIST = $(memosviews_DATA) ++subdir = views/memos ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(memosviews_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/memos/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu views/memos/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++memosviewsDATA_INSTALL = $(INSTALL_DATA) + install-memosviewsDATA: $(memosviews_DATA) + @$(NORMAL_INSTALL) +- test -z "$(memosviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(memosviewsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(memosviewsdir) + @list='$(memosviews_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(memosviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(memosviewsdir)/$$f'"; \ +- $(memosviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(memosviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(memosviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(memosviewsdir)/$$f"; \ ++ $(memosviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(memosviewsdir)/$$f; \ + done + + uninstall-memosviewsDATA: + @$(NORMAL_UNINSTALL) + @list='$(memosviews_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(memosviewsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(memosviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(memosviewsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(memosviewsdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -431,23 +441,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +476,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(memosviewsdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(memosviewsdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -484,7 +498,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -495,34 +509,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-memosviewsDATA + +-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 +@@ -541,21 +545,18 @@ + + ps-am: + +-uninstall-am: uninstall-memosviewsDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-memosviewsDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man \ +- install-memosviewsDATA install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-memosviewsDATA ++ dvi-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-memosviewsDATA \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-memosviewsDATA + + # 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 -ruN evolution-2.12.2.orig/views/tasks/Makefile.in evolution-2.12.2/views/tasks/Makefile.in +--- evolution-2.12.2.orig/views/tasks/Makefile.in 2007-12-05 15:49:59.000000000 +0100 ++++ evolution-2.12.2/views/tasks/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,34 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = views/tasks +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(tasksviewsdir)" +-tasksviewsDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(tasksviews_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -91,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -102,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -127,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -152,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -160,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -218,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -242,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -266,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -274,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -281,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -290,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -312,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -342,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -361,69 +384,56 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + tasksviewsdir = $(viewsdir)/tasks + tasksviews_DATA = Tasks.galview With_DueDate.galview With_Status.galview galview.xml + EXTRA_DIST = $(tasksviews_DATA) ++subdir = views/tasks ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(tasksviews_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/tasks/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu views/tasks/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++tasksviewsDATA_INSTALL = $(INSTALL_DATA) + install-tasksviewsDATA: $(tasksviews_DATA) + @$(NORMAL_INSTALL) +- test -z "$(tasksviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(tasksviewsdir)" ++ $(mkinstalldirs) $(DESTDIR)$(tasksviewsdir) + @list='$(tasksviews_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(tasksviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tasksviewsdir)/$$f'"; \ +- $(tasksviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tasksviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(tasksviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(tasksviewsdir)/$$f"; \ ++ $(tasksviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(tasksviewsdir)/$$f; \ + done + + uninstall-tasksviewsDATA: + @$(NORMAL_UNINSTALL) + @list='$(tasksviews_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(tasksviewsdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(tasksviewsdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(tasksviewsdir)/$$f"; \ ++ rm -f $(DESTDIR)$(tasksviewsdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -431,23 +441,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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,10 +476,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(tasksviewsdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(tasksviewsdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -484,7 +498,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -495,34 +509,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-tasksviewsDATA + +-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 +@@ -541,21 +545,18 @@ + + ps-am: + +-uninstall-am: uninstall-tasksviewsDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-tasksviewsDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-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-tasksviewsDATA installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-tasksviewsDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip \ ++ install-tasksviewsDATA installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-tasksviewsDATA + + # 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 -ruN evolution-2.12.2.orig/widgets/e-timezone-dialog/Makefile.in evolution-2.12.2/widgets/e-timezone-dialog/Makefile.in +--- evolution-2.12.2.orig/widgets/e-timezone-dialog/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/widgets/e-timezone-dialog/Makefile.in 2007-12-05 15:55:04.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,60 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = widgets/e-timezone-dialog +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libetimezonedialog_la_DEPENDENCIES = \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(am__DEPENDENCIES_1) +-am_libetimezonedialog_la_OBJECTS = e-timezone-dialog.lo +-libetimezonedialog_la_OBJECTS = $(am_libetimezonedialog_la_OBJECTS) +-libetimezonedialog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libetimezonedialog_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libetimezonedialog_la_SOURCES) +-DIST_SOURCES = $(libetimezonedialog_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -118,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -129,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -154,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -179,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -187,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -245,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -269,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -301,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -308,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -317,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -339,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -369,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -388,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + INCLUDES = \ + -I$(top_srcdir) \ +@@ -401,86 +394,98 @@ + -DG_LOG_DOMAIN=__FILE__ \ + $(TZDIALOG_CFLAGS) + ++ + privsolib_LTLIBRARIES = \ + libetimezonedialog.la + ++ + libetimezonedialog_la_SOURCES = \ + e-timezone-dialog.c \ + e-timezone-dialog.h + ++ + libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) ++ + libetimezonedialog_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_LIBS) + ++ + glade_DATA = e-timezone-dialog.glade ++ + EXTRA_DIST = $(glade_DATA) ++subdir = widgets/e-timezone-dialog ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libetimezonedialog_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la ++am_libetimezonedialog_la_OBJECTS = e-timezone-dialog.lo ++libetimezonedialog_la_OBJECTS = $(am_libetimezonedialog_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-timezone-dialog.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libetimezonedialog_la_SOURCES) ++DATA = $(glade_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ++SOURCES = $(libetimezonedialog_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/e-timezone-dialog/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu widgets/e-timezone-dialog/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libetimezonedialog.la: $(libetimezonedialog_la_OBJECTS) $(libetimezonedialog_la_DEPENDENCIES) +- $(libetimezonedialog_la_LINK) -rpath $(privsolibdir) $(libetimezonedialog_la_OBJECTS) $(libetimezonedialog_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libetimezonedialog_la_LDFLAGS) $(libetimezonedialog_la_OBJECTS) $(libetimezonedialog_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -488,49 +493,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-timezone-dialog.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -539,7 +569,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -551,11 +580,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -578,23 +606,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -608,10 +641,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -631,7 +663,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -645,34 +677,24 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-gladeDATA install-privsolibLTLIBRARIES + +-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 +@@ -693,24 +715,21 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am \ +- install-privsolibLTLIBRARIES install-ps install-ps-am \ +- 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-gladeDATA uninstall-privsolibLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-privsolibLTLIBRARIES 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-gladeDATA \ ++ uninstall-info-am uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/widgets/Makefile.in evolution-2.12.2/widgets/Makefile.in +--- evolution-2.12.2.orig/widgets/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/widgets/Makefile.in 2007-12-05 15:55:03.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,17 @@ + # 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 +@@ -29,37 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = widgets +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-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 +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -93,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -104,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -129,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -154,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -162,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -220,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -244,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -268,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -276,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -283,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -292,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -314,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -344,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -363,12 +384,10 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ ++ + SUBDIRS = \ + table \ + text \ +@@ -376,41 +395,32 @@ + e-timezone-dialog \ + menus + ++ + EXTRA_DIST = \ + ChangeLog.pre-1-4 + ++subdir = widgets ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu widgets/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo +@@ -418,6 +428,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, +@@ -425,13 +439,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -443,20 +451,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -477,7 +480,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -488,6 +491,14 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -496,22 +507,19 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -521,11 +529,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -548,23 +555,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -575,19 +587,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -597,6 +605,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -616,7 +625,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -627,34 +636,25 @@ + + 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 + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -673,24 +673,26 @@ + + 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 \ +- 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 \ +- 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 ++.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 \ ++ dvi-recursive info info-am info-recursive install install-am \ ++ install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive + + # 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 -ruN evolution-2.12.2.orig/widgets/menus/Makefile.in evolution-2.12.2/widgets/menus/Makefile.in +--- evolution-2.12.2.orig/widgets/menus/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/widgets/menus/Makefile.in 2007-12-05 15:55:04.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,68 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = widgets/menus +-DIST_COMMON = $(libmenusinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(libmenusincludedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libmenus_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/table/libetable.la \ +- $(top_builddir)/widgets/misc/libemiscwidgets.la \ +- $(am__DEPENDENCIES_1) +-am_libmenus_la_OBJECTS = gal-view-menus.lo gal-define-views-dialog.lo \ +- gal-define-views-model.lo gal-view-collection.lo \ +- gal-view-etable.lo gal-view-factory-etable.lo \ +- gal-view-factory.lo gal-view-instance-save-as-dialog.lo \ +- gal-view-instance.lo gal-view-new-dialog.lo gal-view.lo +-libmenus_la_OBJECTS = $(am_libmenus_la_OBJECTS) +-libmenus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libmenus_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libmenus_la_SOURCES) +-DIST_SOURCES = $(libmenus_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-libmenusincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(libmenusinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -127,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -138,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -163,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -188,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -196,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -254,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -278,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -302,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -310,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -317,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -326,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -348,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -378,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -397,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + privsolib_LTLIBRARIES = libmenus.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +@@ -411,6 +396,7 @@ + -DG_LOG_DOMAIN=\"menus\" \ + $(E_UTIL_CFLAGS) + ++ + libmenus_la_SOURCES = \ + gal-view-menus.c \ + gal-define-views-dialog.c \ +@@ -425,12 +411,15 @@ + gal-view.c \ + gal-view-menus.h + ++ + glade_DATA = \ + gal-define-views.glade \ + gal-view-new-dialog.glade \ + gal-view-instance-save-as-dialog.glade + ++ + libmenusincludedir = $(privincludedir)/menus ++ + libmenusinclude_HEADERS = \ + gal-define-views-dialog.h \ + gal-define-views-model.h \ +@@ -443,83 +432,110 @@ + gal-view-new-dialog.h \ + gal-view.h + ++ + libmenus_la_LDFLAGS = $(NO_UNDEFINED) ++ + libmenus_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(E_UTIL_LIBS) + ++ + icons = + EXTRA_DIST = \ + $(icons) \ + $(glade_DATA) + ++subdir = widgets/menus ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++libmenus_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/table/libetable.la \ ++ $(top_builddir)/widgets/misc/libemiscwidgets.la ++am_libmenus_la_OBJECTS = gal-view-menus.lo gal-define-views-dialog.lo \ ++ gal-define-views-model.lo gal-view-collection.lo \ ++ gal-view-etable.lo gal-view-factory-etable.lo \ ++ gal-view-factory.lo gal-view-instance-save-as-dialog.lo \ ++ gal-view-instance.lo gal-view-new-dialog.lo gal-view.lo ++libmenus_la_OBJECTS = $(am_libmenus_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gal-define-views-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-define-views-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-collection.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-etable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-factory-etable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-factory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-instance-save-as-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-instance.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-menus.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-new-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gal-view.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libmenus_la_SOURCES) ++DATA = $(glade_DATA) ++ ++HEADERS = $(libmenusinclude_HEADERS) ++ ++DIST_COMMON = $(libmenusinclude_HEADERS) $(srcdir)/Makefile.in \ ++ Makefile.am ++SOURCES = $(libmenus_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/menus/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu widgets/menus/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libmenus.la: $(libmenus_la_OBJECTS) $(libmenus_la_DEPENDENCIES) +- $(libmenus_la_LINK) -rpath $(privsolibdir) $(libmenus_la_OBJECTS) $(libmenus_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libmenus_la_LDFLAGS) $(libmenus_la_OBJECTS) $(libmenus_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -537,66 +553,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-view.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++libmenusincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libmenusincludeHEADERS: $(libmenusinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(libmenusincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libmenusincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(libmenusincludedir) + @list='$(libmenusinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(libmenusincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libmenusincludedir)/$$f'"; \ +- $(libmenusincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libmenusincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(libmenusincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libmenusincludedir)/$$f"; \ ++ $(libmenusincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libmenusincludedir)/$$f; \ + done + + uninstall-libmenusincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libmenusinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(libmenusincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libmenusincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(libmenusincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(libmenusincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -605,7 +647,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -617,11 +658,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -644,23 +684,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -674,10 +719,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(libmenusincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(libmenusincludedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -697,7 +741,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -711,14 +755,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -726,20 +768,12 @@ + install-data-am: install-gladeDATA install-libmenusincludeHEADERS \ + install-privsolibLTLIBRARIES + +-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 +@@ -760,26 +794,22 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-libmenusincludeHEADERS \ +- uninstall-privsolibLTLIBRARIES +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-libmenusincludeHEADERS uninstall-privsolibLTLIBRARIES + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-libmenusincludeHEADERS install-man install-pdf \ +- install-pdf-am install-privsolibLTLIBRARIES install-ps \ +- install-ps-am 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-gladeDATA \ +- uninstall-libmenusincludeHEADERS \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-libmenusincludeHEADERS install-man \ ++ install-privsolibLTLIBRARIES 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-gladeDATA \ ++ uninstall-info-am uninstall-libmenusincludeHEADERS \ + uninstall-privsolibLTLIBRARIES + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -ruN evolution-2.12.2.orig/widgets/misc/Makefile.in evolution-2.12.2/widgets/misc/Makefile.in +--- evolution-2.12.2.orig/widgets/misc/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/widgets/misc/Makefile.in 2007-12-05 15:55:04.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,14 +14,16 @@ + + @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 +@@ -33,165 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = test-calendar$(EXEEXT) test-dateedit$(EXEEXT) \ +- test-dropdown-button$(EXEEXT) \ +- test-multi-config-dialog$(EXEEXT) test-info-label$(EXEEXT) +-subdir = widgets/misc +-DIST_COMMON = $(am__widgetsinclude_HEADERS_DIST) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(widgetsincludedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libefilterbar_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- libemiscwidgets.la $(am__DEPENDENCIES_1) +-am_libefilterbar_la_OBJECTS = e-filter-bar.lo +-libefilterbar_la_OBJECTS = $(am_libefilterbar_la_OBJECTS) +-libefilterbar_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libefilterbar_la_LDFLAGS) $(LDFLAGS) -o $@ +-libemiscwidgets_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/widgets/table/libetable.la \ +- $(top_builddir)/widgets/text/libetext.la \ +- $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ +- $(top_builddir)/a11y/libevolution-a11y.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-am__libemiscwidgets_la_SOURCES_DIST = e-pilot-settings.h \ +- e-activity-handler.h e-attachment.h e-attachment-bar.h \ +- e-spinner.c e-spinner.h e-calendar.h e-calendar-item.h \ +- e-cell-date-edit.h e-cell-percent.h e-cell-renderer-combo.h \ +- e-charset-picker.h e-combo-cell-editable.h e-config-page.h \ +- e-combo-button.h e-dateedit.h e-dropdown-button.h e-expander.h \ +- e-icon-entry.h e-image-chooser.h e-info-label.h e-map.h \ +- e-multi-config-dialog.h e-search-bar.h e-task-bar.h \ +- e-task-widget.h e-send-options.h e-url-entry.h \ +- e-canvas-background.h e-canvas-utils.h e-canvas-vbox.h \ +- e-canvas.h e-cursors.h e-gui-utils.h e-hsv-utils.h \ +- e-popup-menu.h e-printable.h e-reflow-model.h e-reflow.h \ +- e-selection-model-array.h e-selection-model-simple.h \ +- e-selection-model.h e-unicode.h e-colors.h e-pilot-settings.c \ +- e-activity-handler.c e-calendar.c e-attachment.c \ +- e-attachment-bar.c e-calendar-item.c e-cell-date-edit.c \ +- e-cell-percent.c e-cell-renderer-combo.c e-charset-picker.c \ +- e-combo-cell-editable.c e-config-page.c e-combo-button.c \ +- e-dateedit.c e-dropdown-button.c e-expander.c e-icon-entry.c \ +- e-image-chooser.c e-info-label.c e-map.c \ +- e-multi-config-dialog.c e-search-bar.c e-task-bar.c \ +- e-task-widget.c e-send-options.c e-url-entry.c \ +- e-canvas-background.c e-canvas-utils.c e-canvas-vbox.c \ +- e-canvas.c e-cursors.c e-gui-utils.c e-hsv-utils.c \ +- e-popup-menu.c e-printable.c e-reflow-model.c e-reflow.c \ +- e-selection-model-array.c e-selection-model-simple.c \ +- e-selection-model.c e-unicode.c e-colors.c +-am__objects_1 = +-am__objects_2 = $(am__objects_1) e-spinner.lo +-@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = e-pilot-settings.lo +-am_libemiscwidgets_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ +- e-activity-handler.lo e-calendar.lo e-attachment.lo \ +- e-attachment-bar.lo e-calendar-item.lo e-cell-date-edit.lo \ +- e-cell-percent.lo e-cell-renderer-combo.lo e-charset-picker.lo \ +- e-combo-cell-editable.lo e-config-page.lo e-combo-button.lo \ +- e-dateedit.lo e-dropdown-button.lo e-expander.lo \ +- e-icon-entry.lo e-image-chooser.lo e-info-label.lo e-map.lo \ +- e-multi-config-dialog.lo e-search-bar.lo e-task-bar.lo \ +- e-task-widget.lo e-send-options.lo e-url-entry.lo \ +- e-canvas-background.lo e-canvas-utils.lo e-canvas-vbox.lo \ +- e-canvas.lo e-cursors.lo e-gui-utils.lo e-hsv-utils.lo \ +- e-popup-menu.lo e-printable.lo e-reflow-model.lo e-reflow.lo \ +- e-selection-model-array.lo e-selection-model-simple.lo \ +- e-selection-model.lo e-unicode.lo e-colors.lo +-libemiscwidgets_la_OBJECTS = $(am_libemiscwidgets_la_OBJECTS) +-libemiscwidgets_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libemiscwidgets_la_LDFLAGS) $(LDFLAGS) -o $@ +-PROGRAMS = $(noinst_PROGRAMS) +-am_test_calendar_OBJECTS = test-calendar.$(OBJEXT) +-test_calendar_OBJECTS = $(am_test_calendar_OBJECTS) +-test_calendar_DEPENDENCIES = libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_test_dateedit_OBJECTS = test-dateedit.$(OBJEXT) +-test_dateedit_OBJECTS = $(am_test_dateedit_OBJECTS) +-test_dateedit_DEPENDENCIES = libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_test_dropdown_button_OBJECTS = test-dropdown-button.$(OBJEXT) +-test_dropdown_button_OBJECTS = $(am_test_dropdown_button_OBJECTS) +-test_dropdown_button_DEPENDENCIES = libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_test_info_label_OBJECTS = test-info-label.$(OBJEXT) +-test_info_label_OBJECTS = $(am_test_info_label_OBJECTS) +-test_info_label_DEPENDENCIES = libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-am_test_multi_config_dialog_OBJECTS = \ +- test-multi-config-dialog.$(OBJEXT) +-test_multi_config_dialog_OBJECTS = \ +- $(am_test_multi_config_dialog_OBJECTS) +-test_multi_config_dialog_DEPENDENCIES = libemiscwidgets.la \ +- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libefilterbar_la_SOURCES) $(libemiscwidgets_la_SOURCES) \ +- $(test_calendar_SOURCES) $(test_dateedit_SOURCES) \ +- $(test_dropdown_button_SOURCES) $(test_info_label_SOURCES) \ +- $(test_multi_config_dialog_SOURCES) +-DIST_SOURCES = $(libefilterbar_la_SOURCES) \ +- $(am__libemiscwidgets_la_SOURCES_DIST) \ +- $(test_calendar_SOURCES) $(test_dateedit_SOURCES) \ +- $(test_dropdown_button_SOURCES) $(test_info_label_SOURCES) \ +- $(test_multi_config_dialog_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-am__widgetsinclude_HEADERS_DIST = e-pilot-settings.h \ +- e-activity-handler.h e-attachment.h e-attachment-bar.h \ +- e-spinner.c e-spinner.h e-calendar.h e-calendar-item.h \ +- e-cell-date-edit.h e-cell-percent.h e-cell-renderer-combo.h \ +- e-charset-picker.h e-combo-cell-editable.h e-config-page.h \ +- e-combo-button.h e-dateedit.h e-dropdown-button.h e-expander.h \ +- e-icon-entry.h e-image-chooser.h e-info-label.h e-map.h \ +- e-multi-config-dialog.h e-search-bar.h e-task-bar.h \ +- e-task-widget.h e-send-options.h e-url-entry.h \ +- e-canvas-background.h e-canvas-utils.h e-canvas-vbox.h \ +- e-canvas.h e-cursors.h e-gui-utils.h e-hsv-utils.h \ +- e-popup-menu.h e-printable.h e-reflow-model.h e-reflow.h \ +- e-selection-model-array.h e-selection-model-simple.h \ +- e-selection-model.h e-unicode.h e-colors.h +-widgetsincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(widgetsinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -225,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -236,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -261,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -286,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -294,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -352,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -376,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -400,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -408,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -415,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -424,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -446,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -476,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -495,13 +384,11 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/a11y/widgets \ +@@ -513,19 +400,24 @@ + $(GNOME_PLATFORM_CFLAGS) \ + $(ICONV_CFLAGS) + ++ + privsolib_LTLIBRARIES = \ + libemiscwidgets.la \ + libefilterbar.la + ++ + widgetsincludedir = $(privincludedir)/misc +-@ENABLE_PILOT_CONDUITS_FALSE@pilot_sources = ++ + @ENABLE_PILOT_CONDUITS_TRUE@pilot_sources = e-pilot-settings.c +-@ENABLE_PILOT_CONDUITS_FALSE@pilot_headers = ++@ENABLE_PILOT_CONDUITS_FALSE@pilot_sources = + @ENABLE_PILOT_CONDUITS_TRUE@pilot_headers = e-pilot-settings.h ++@ENABLE_PILOT_CONDUITS_FALSE@pilot_headers = ++ + glade_DATA = e-send-options.glade \ + gal-categories.glade \ + e-attachment.glade + ++ + widgetsinclude_HEADERS = \ + $(pilot_headers) \ + e-activity-handler.h \ +@@ -572,6 +464,7 @@ + e-unicode.h \ + e-colors.h + ++ + libemiscwidgets_la_SOURCES = \ + $(widgetsinclude_HEADERS) \ + $(pilot_sources) \ +@@ -617,7 +510,9 @@ + e-unicode.c \ + e-colors.c + ++ + libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED) ++ + libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/table/libetable.la \ +@@ -628,136 +523,303 @@ + $(GNOME_PLATFORM_LIBS) \ + $(ICONV_LIBS) + ++ + libefilterbar_la_SOURCES = \ + e-filter-bar.c \ + e-filter-bar.h + ++ + libefilterbar_la_LDFLAGS = $(NO_UNDEFINED) ++ + libefilterbar_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + libemiscwidgets.la \ + $(E_WIDGETS_LIBS) + + ++noinst_PROGRAMS = \ ++ test-calendar \ ++ test-dateedit \ ++ test-dropdown-button \ ++ test-multi-config-dialog \ ++ test-info-label ++ ++ ++ + # test-calendar + test_calendar_SOURCES = \ + test-calendar.c + ++ + test_calendar_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(E_WIDGETS_LIBS) + + ++ + # test-dateedit + test_dateedit_SOURCES = \ + test-dateedit.c + ++ + test_dateedit_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(E_WIDGETS_LIBS) + + ++ + # test-dropdown-button + test_dropdown_button_SOURCES = \ + test-dropdown-button.c + ++ + test_dropdown_button_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(E_WIDGETS_LIBS) + + ++ + # test-multi-config-dialog + test_multi_config_dialog_SOURCES = \ + test-multi-config-dialog.c + ++ + test_multi_config_dialog_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(E_WIDGETS_LIBS) + + ++ + # test-info-label + test_info_label_SOURCES = \ + test-info-label.c + ++ + test_info_label_LDADD = \ + libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(E_WIDGETS_LIBS) + ++ + EXTRA_DIST = \ + $(glade_DATA) \ + e-pilot-settings.h \ + e-pilot-settings.c \ + ChangeLog.pre-1-4 + ++subdir = widgets/misc ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libefilterbar_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libfilter.la \ ++@OS_WIN32_TRUE@ libemiscwidgets.la ++@OS_WIN32_FALSE@libefilterbar_la_DEPENDENCIES = libemiscwidgets.la ++am_libefilterbar_la_OBJECTS = e-filter-bar.lo ++libefilterbar_la_OBJECTS = $(am_libefilterbar_la_OBJECTS) ++libemiscwidgets_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/widgets/table/libetable.la \ ++ $(top_builddir)/widgets/text/libetext.la \ ++ $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ ++ $(top_builddir)/a11y/libevolution-a11y.la ++am__libemiscwidgets_la_SOURCES_DIST = e-pilot-settings.h \ ++ e-activity-handler.h e-attachment.h e-attachment-bar.h \ ++ e-spinner.c e-spinner.h e-calendar.h e-calendar-item.h \ ++ e-cell-date-edit.h e-cell-percent.h e-cell-renderer-combo.h \ ++ e-charset-picker.h e-combo-cell-editable.h e-config-page.h \ ++ e-combo-button.h e-dateedit.h e-dropdown-button.h e-expander.h \ ++ e-icon-entry.h e-image-chooser.h e-info-label.h e-map.h \ ++ e-multi-config-dialog.h e-search-bar.h e-task-bar.h \ ++ e-task-widget.h e-send-options.h e-url-entry.h \ ++ e-canvas-background.h e-canvas-utils.h e-canvas-vbox.h \ ++ e-canvas.h e-cursors.h e-gui-utils.h e-hsv-utils.h \ ++ e-popup-menu.h e-printable.h e-reflow-model.h e-reflow.h \ ++ e-selection-model-array.h e-selection-model-simple.h \ ++ e-selection-model.h e-unicode.h e-colors.h e-pilot-settings.c \ ++ e-activity-handler.c e-calendar.c e-attachment.c \ ++ e-attachment-bar.c e-calendar-item.c e-cell-date-edit.c \ ++ e-cell-percent.c e-cell-renderer-combo.c e-charset-picker.c \ ++ e-combo-cell-editable.c e-config-page.c e-combo-button.c \ ++ e-dateedit.c e-dropdown-button.c e-expander.c e-icon-entry.c \ ++ e-image-chooser.c e-info-label.c e-map.c \ ++ e-multi-config-dialog.c e-search-bar.c e-task-bar.c \ ++ e-task-widget.c e-send-options.c e-url-entry.c \ ++ e-canvas-background.c e-canvas-utils.c e-canvas-vbox.c \ ++ e-canvas.c e-cursors.c e-gui-utils.c e-hsv-utils.c \ ++ e-popup-menu.c e-printable.c e-reflow-model.c e-reflow.c \ ++ e-selection-model-array.c e-selection-model-simple.c \ ++ e-selection-model.c e-unicode.c e-colors.c ++@ENABLE_PILOT_CONDUITS_TRUE@am__objects_1 = ++@ENABLE_PILOT_CONDUITS_FALSE@am__objects_1 = ++am__objects_2 = $(am__objects_1) e-spinner.lo ++@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = e-pilot-settings.lo ++@ENABLE_PILOT_CONDUITS_FALSE@am__objects_3 = ++am_libemiscwidgets_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ ++ e-activity-handler.lo e-calendar.lo e-attachment.lo \ ++ e-attachment-bar.lo e-calendar-item.lo e-cell-date-edit.lo \ ++ e-cell-percent.lo e-cell-renderer-combo.lo e-charset-picker.lo \ ++ e-combo-cell-editable.lo e-config-page.lo e-combo-button.lo \ ++ e-dateedit.lo e-dropdown-button.lo e-expander.lo \ ++ e-icon-entry.lo e-image-chooser.lo e-info-label.lo e-map.lo \ ++ e-multi-config-dialog.lo e-search-bar.lo e-task-bar.lo \ ++ e-task-widget.lo e-send-options.lo e-url-entry.lo \ ++ e-canvas-background.lo e-canvas-utils.lo e-canvas-vbox.lo \ ++ e-canvas.lo e-cursors.lo e-gui-utils.lo e-hsv-utils.lo \ ++ e-popup-menu.lo e-printable.lo e-reflow-model.lo e-reflow.lo \ ++ e-selection-model-array.lo e-selection-model-simple.lo \ ++ e-selection-model.lo e-unicode.lo e-colors.lo ++libemiscwidgets_la_OBJECTS = $(am_libemiscwidgets_la_OBJECTS) ++noinst_PROGRAMS = test-calendar$(EXEEXT) test-dateedit$(EXEEXT) \ ++ test-dropdown-button$(EXEEXT) test-multi-config-dialog$(EXEEXT) \ ++ test-info-label$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++ ++am_test_calendar_OBJECTS = test-calendar.$(OBJEXT) ++test_calendar_OBJECTS = $(am_test_calendar_OBJECTS) ++test_calendar_DEPENDENCIES = libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++test_calendar_LDFLAGS = ++am_test_dateedit_OBJECTS = test-dateedit.$(OBJEXT) ++test_dateedit_OBJECTS = $(am_test_dateedit_OBJECTS) ++test_dateedit_DEPENDENCIES = libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++test_dateedit_LDFLAGS = ++am_test_dropdown_button_OBJECTS = test-dropdown-button.$(OBJEXT) ++test_dropdown_button_OBJECTS = $(am_test_dropdown_button_OBJECTS) ++test_dropdown_button_DEPENDENCIES = libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++test_dropdown_button_LDFLAGS = ++am_test_info_label_OBJECTS = test-info-label.$(OBJEXT) ++test_info_label_OBJECTS = $(am_test_info_label_OBJECTS) ++test_info_label_DEPENDENCIES = libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++test_info_label_LDFLAGS = ++am_test_multi_config_dialog_OBJECTS = test-multi-config-dialog.$(OBJEXT) ++test_multi_config_dialog_OBJECTS = \ ++ $(am_test_multi_config_dialog_OBJECTS) ++test_multi_config_dialog_DEPENDENCIES = libemiscwidgets.la \ ++ $(top_builddir)/e-util/libeutil.la ++test_multi_config_dialog_LDFLAGS = ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-activity-handler.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-attachment-bar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-attachment.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas-background.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas-vbox.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date-edit.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-percent.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-renderer-combo.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-charset-picker.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-colors.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-combo-button.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-combo-cell-editable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-config-page.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cursors.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-dateedit.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-dropdown-button.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-expander.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-filter-bar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-gui-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-hsv-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-icon-entry.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-image-chooser.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-info-label.Plo ./$(DEPDIR)/e-map.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-multi-config-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-pilot-settings.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-popup-menu.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-printable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-reflow-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-reflow.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-search-bar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-selection-model-array.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-selection-model-simple.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-selection-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-send-options.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-spinner.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-task-bar.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-task-widget.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-unicode.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-url-entry.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-calendar.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-dateedit.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-dropdown-button.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-info-label.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-multi-config-dialog.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libefilterbar_la_SOURCES) \ ++ $(am__libemiscwidgets_la_SOURCES_DIST) $(test_calendar_SOURCES) \ ++ $(test_dateedit_SOURCES) $(test_dropdown_button_SOURCES) \ ++ $(test_info_label_SOURCES) $(test_multi_config_dialog_SOURCES) ++DATA = $(glade_DATA) ++ ++HEADERS = $(widgetsinclude_HEADERS) ++ ++DIST_COMMON = $(srcdir)/Makefile.in $(widgetsinclude_HEADERS) ChangeLog \ ++ Makefile.am ++SOURCES = $(libefilterbar_la_SOURCES) $(libemiscwidgets_la_SOURCES) $(test_calendar_SOURCES) $(test_dateedit_SOURCES) $(test_dropdown_button_SOURCES) $(test_info_label_SOURCES) $(test_multi_config_dialog_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/misc/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu widgets/misc/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libefilterbar.la: $(libefilterbar_la_OBJECTS) $(libefilterbar_la_DEPENDENCIES) +- $(libefilterbar_la_LINK) -rpath $(privsolibdir) $(libefilterbar_la_OBJECTS) $(libefilterbar_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libefilterbar_la_LDFLAGS) $(libefilterbar_la_OBJECTS) $(libefilterbar_la_LIBADD) $(LIBS) + libemiscwidgets.la: $(libemiscwidgets_la_OBJECTS) $(libemiscwidgets_la_DEPENDENCIES) +- $(libemiscwidgets_la_LINK) -rpath $(privsolibdir) $(libemiscwidgets_la_OBJECTS) $(libemiscwidgets_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libemiscwidgets_la_LDFLAGS) $(libemiscwidgets_la_OBJECTS) $(libemiscwidgets_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -767,22 +829,22 @@ + done + test-calendar$(EXEEXT): $(test_calendar_OBJECTS) $(test_calendar_DEPENDENCIES) + @rm -f test-calendar$(EXEEXT) +- $(LINK) $(test_calendar_OBJECTS) $(test_calendar_LDADD) $(LIBS) ++ $(LINK) $(test_calendar_LDFLAGS) $(test_calendar_OBJECTS) $(test_calendar_LDADD) $(LIBS) + test-dateedit$(EXEEXT): $(test_dateedit_OBJECTS) $(test_dateedit_DEPENDENCIES) + @rm -f test-dateedit$(EXEEXT) +- $(LINK) $(test_dateedit_OBJECTS) $(test_dateedit_LDADD) $(LIBS) ++ $(LINK) $(test_dateedit_LDFLAGS) $(test_dateedit_OBJECTS) $(test_dateedit_LDADD) $(LIBS) + test-dropdown-button$(EXEEXT): $(test_dropdown_button_OBJECTS) $(test_dropdown_button_DEPENDENCIES) + @rm -f test-dropdown-button$(EXEEXT) +- $(LINK) $(test_dropdown_button_OBJECTS) $(test_dropdown_button_LDADD) $(LIBS) ++ $(LINK) $(test_dropdown_button_LDFLAGS) $(test_dropdown_button_OBJECTS) $(test_dropdown_button_LDADD) $(LIBS) + test-info-label$(EXEEXT): $(test_info_label_OBJECTS) $(test_info_label_DEPENDENCIES) + @rm -f test-info-label$(EXEEXT) +- $(LINK) $(test_info_label_OBJECTS) $(test_info_label_LDADD) $(LIBS) ++ $(LINK) $(test_info_label_LDFLAGS) $(test_info_label_OBJECTS) $(test_info_label_LDADD) $(LIBS) + test-multi-config-dialog$(EXEEXT): $(test_multi_config_dialog_OBJECTS) $(test_multi_config_dialog_DEPENDENCIES) + @rm -f test-multi-config-dialog$(EXEEXT) +- $(LINK) $(test_multi_config_dialog_OBJECTS) $(test_multi_config_dialog_LDADD) $(LIBS) ++ $(LINK) $(test_multi_config_dialog_LDFLAGS) $(test_multi_config_dialog_OBJECTS) $(test_multi_config_dialog_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -838,66 +900,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-multi-config-dialog.Po@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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++widgetsincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-widgetsincludeHEADERS: $(widgetsinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(widgetsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(widgetsincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(widgetsincludedir) + @list='$(widgetsinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(widgetsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(widgetsincludedir)/$$f'"; \ +- $(widgetsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(widgetsincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(widgetsincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(widgetsincludedir)/$$f"; \ ++ $(widgetsincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(widgetsincludedir)/$$f; \ + done + + uninstall-widgetsincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(widgetsinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(widgetsincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(widgetsincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(widgetsincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(widgetsincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -906,7 +994,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -918,11 +1005,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -945,23 +1031,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -978,10 +1069,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(widgetsincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(widgetsincludedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -1001,7 +1091,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1015,14 +1105,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -1030,20 +1118,12 @@ + install-data-am: install-gladeDATA install-privsolibLTLIBRARIES \ + install-widgetsincludeHEADERS + +-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 +@@ -1064,26 +1144,23 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES \ +- uninstall-widgetsincludeHEADERS +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-privsolibLTLIBRARIES uninstall-widgetsincludeHEADERS + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS clean-privsolibLTLIBRARIES \ +- ctags dist-hook 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-gladeDATA install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-privsolibLTLIBRARIES install-ps \ +- install-ps-am install-strip install-widgetsincludeHEADERS \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ ctags distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-exec install-exec-am install-gladeDATA install-info \ ++ install-info-am install-man install-privsolibLTLIBRARIES \ ++ install-strip install-widgetsincludeHEADERS 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-gladeDATA \ +- uninstall-privsolibLTLIBRARIES uninstall-widgetsincludeHEADERS ++ uninstall-info-am uninstall-privsolibLTLIBRARIES \ ++ uninstall-widgetsincludeHEADERS + + + dist-hook: +diff -ruN evolution-2.12.2.orig/widgets/table/Makefile.in evolution-2.12.2/widgets/table/Makefile.in +--- evolution-2.12.2.orig/widgets/table/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/widgets/table/Makefile.in 2007-12-05 15:55:04.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,13 +14,16 @@ + + @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 +@@ -32,87 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = widgets/table +-DIST_COMMON = $(libetableinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in ChangeLog +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(libetableincludedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libetable_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/a11y/libevolution-a11y.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_libetable_la_OBJECTS = e-cell.lo e-cell-checkbox.lo e-cell-combo.lo \ +- e-cell-date.lo e-cell-float.lo e-cell-number.lo \ +- e-cell-pixbuf.lo e-cell-popup.lo e-cell-progress.lo \ +- e-cell-size.lo e-cell-spin-button.lo e-cell-text.lo \ +- e-cell-toggle.lo e-cell-tree.lo e-cell-vbox.lo e-cell-hbox.lo \ +- e-table-click-to-add.lo e-table-col.lo \ +- e-table-column-specification.lo e-table-config.lo \ +- e-table-extras.lo e-table-field-chooser-dialog.lo \ +- e-table-field-chooser-item.lo e-table-field-chooser.lo \ +- e-table-group.lo e-table-group-container.lo \ +- e-table-group-leaf.lo e-table-header.lo e-table-header-item.lo \ +- e-table-header-utils.lo e-table-item.lo \ +- e-table-memory-callbacks.lo e-table-memory-store.lo \ +- e-table-memory.lo e-table-model.lo e-table-one.lo \ +- e-table-scrolled.lo e-table-search.lo \ +- e-table-selection-model.lo e-table-simple.lo \ +- e-table-sort-info.lo e-table-sorted.lo \ +- e-table-sorted-variable.lo e-table-sorter.lo \ +- e-table-sorting-utils.lo e-table-specification.lo \ +- e-table-state.lo e-table-subset.lo e-table-subset-variable.lo \ +- e-table-utils.lo e-table-without.lo e-table.lo \ +- e-tree-memory-callbacks.lo e-tree-memory.lo e-tree-model.lo \ +- e-tree-scrolled.lo e-tree-selection-model.lo e-tree-sorted.lo \ +- e-tree-table-adapter.lo e-tree.lo +-libetable_la_OBJECTS = $(am_libetable_la_OBJECTS) +-libetable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libetable_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libetable_la_SOURCES) +-DIST_SOURCES = $(libetable_la_SOURCES) +-gladeDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(glade_DATA) +-libetableincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(libetableinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -146,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -157,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -182,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -207,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -215,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -273,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -297,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -321,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -329,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -336,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -345,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -367,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -397,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -416,21 +384,20 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ + @OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la + ++ + glade_DATA = \ + e-table-config.glade \ + e-table-config-no-group.glade \ + e-table-field-chooser.glade + ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +@@ -439,7 +406,9 @@ + -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ + -DG_LOG_DOMAIN=\"e-table\" + ++ + privsolib_LTLIBRARIES = libetable.la ++ + libetable_la_SOURCES = \ + e-cell.c \ + e-cell-checkbox.c \ +@@ -502,7 +471,9 @@ + e-tree-table-adapter.c \ + e-tree.c + ++ + libetableincludedir = $(privincludedir)/table ++ + libetableinclude_HEADERS = \ + e-cell.h \ + e-cell-checkbox.h \ +@@ -568,7 +539,9 @@ + e-tree-table-adapter.h \ + e-tree.h + ++ + libetable_la_LDFLAGS = $(NO_UNDEFINED) ++ + libetable_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ +@@ -576,6 +549,7 @@ + $(E_WIDGETS_LIBS) \ + $(GNOME_PLATFORM_LIBS) + ++ + icons = \ + add-col.xpm \ + arrow-down.xpm \ +@@ -587,75 +561,172 @@ + tree-expanded.xpm \ + tree-unexpanded.xpm + ++ + EXTRA_DIST = \ + $(icons) \ + $(glade_DATA) + ++subdir = widgets/table ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libetable_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la ++@OS_WIN32_FALSE@libetable_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la ++am_libetable_la_OBJECTS = e-cell.lo e-cell-checkbox.lo e-cell-combo.lo \ ++ e-cell-date.lo e-cell-float.lo e-cell-number.lo \ ++ e-cell-pixbuf.lo e-cell-popup.lo e-cell-progress.lo \ ++ e-cell-size.lo e-cell-spin-button.lo e-cell-text.lo \ ++ e-cell-toggle.lo e-cell-tree.lo e-cell-vbox.lo e-cell-hbox.lo \ ++ e-table-click-to-add.lo e-table-col.lo \ ++ e-table-column-specification.lo e-table-config.lo \ ++ e-table-extras.lo e-table-field-chooser-dialog.lo \ ++ e-table-field-chooser-item.lo e-table-field-chooser.lo \ ++ e-table-group.lo e-table-group-container.lo \ ++ e-table-group-leaf.lo e-table-header.lo e-table-header-item.lo \ ++ e-table-header-utils.lo e-table-item.lo \ ++ e-table-memory-callbacks.lo e-table-memory-store.lo \ ++ e-table-memory.lo e-table-model.lo e-table-one.lo \ ++ e-table-scrolled.lo e-table-search.lo \ ++ e-table-selection-model.lo e-table-simple.lo \ ++ e-table-sort-info.lo e-table-sorted.lo \ ++ e-table-sorted-variable.lo e-table-sorter.lo \ ++ e-table-sorting-utils.lo e-table-specification.lo \ ++ e-table-state.lo e-table-subset.lo e-table-subset-variable.lo \ ++ e-table-utils.lo e-table-without.lo e-table.lo \ ++ e-tree-memory-callbacks.lo e-tree-memory.lo e-tree-model.lo \ ++ e-tree-scrolled.lo e-tree-selection-model.lo e-tree-sorted.lo \ ++ e-tree-table-adapter.lo e-tree.lo ++libetable_la_OBJECTS = $(am_libetable_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-cell-checkbox.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-combo.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-float.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-hbox.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-number.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-pixbuf.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-popup.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-progress.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-size.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-spin-button.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-text.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-toggle.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-tree.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-vbox.Plo ./$(DEPDIR)/e-cell.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-click-to-add.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-col.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-column-specification.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-config.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-extras.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-field-chooser-dialog.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-field-chooser-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-field-chooser.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-group-container.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-group-leaf.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-group.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-header-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-header-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-header.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-item.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-memory-callbacks.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-memory-store.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-memory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-one.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-scrolled.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-search.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-selection-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-simple.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sort-info.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorted-variable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorted.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorting-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-specification.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-state.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-subset-variable.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-subset.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-utils.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-without.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-memory-callbacks.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-memory.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-scrolled.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-selection-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-sorted.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-table-adapter.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-tree.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libetable_la_SOURCES) ++DATA = $(glade_DATA) ++ ++HEADERS = $(libetableinclude_HEADERS) ++ ++DIST_COMMON = $(libetableinclude_HEADERS) $(srcdir)/Makefile.in \ ++ ChangeLog Makefile.am ++SOURCES = $(libetable_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/table/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu widgets/table/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libetable.la: $(libetable_la_OBJECTS) $(libetable_la_DEPENDENCIES) +- $(libetable_la_LINK) -rpath $(privsolibdir) $(libetable_la_OBJECTS) $(libetable_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libetable_la_LDFLAGS) $(libetable_la_OBJECTS) $(libetable_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -722,66 +793,92 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-tree.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++gladeDATA_INSTALL = $(INSTALL_DATA) + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" ++ $(mkinstalldirs) $(DESTDIR)$(gladedir) + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ +- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ ++ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ + done + + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ ++ rm -f $(DESTDIR)$(gladedir)/$$f; \ + done ++libetableincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libetableincludeHEADERS: $(libetableinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(libetableincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libetableincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(libetableincludedir) + @list='$(libetableinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(libetableincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libetableincludedir)/$$f'"; \ +- $(libetableincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libetableincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(libetableincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetableincludedir)/$$f"; \ ++ $(libetableincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetableincludedir)/$$f; \ + done + + uninstall-libetableincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libetableinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(libetableincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libetableincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(libetableincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(libetableincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -790,7 +887,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -802,11 +898,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -829,23 +924,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -859,10 +959,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(libetableincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(libetableincludedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -882,7 +981,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -896,14 +995,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -911,20 +1008,12 @@ + install-data-am: install-gladeDATA install-libetableincludeHEADERS \ + install-privsolibLTLIBRARIES + +-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 +@@ -945,26 +1034,23 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-libetableincludeHEADERS \ ++uninstall-am: uninstall-gladeDATA uninstall-info-am \ ++ uninstall-libetableincludeHEADERS \ + uninstall-privsolibLTLIBRARIES + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ +- install-html install-html-am install-info install-info-am \ +- install-libetableincludeHEADERS install-man install-pdf \ +- install-pdf-am install-privsolibLTLIBRARIES install-ps \ +- install-ps-am 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-gladeDATA \ +- uninstall-libetableincludeHEADERS \ ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-libetableincludeHEADERS install-man \ ++ install-privsolibLTLIBRARIES 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-gladeDATA \ ++ uninstall-info-am uninstall-libetableincludeHEADERS \ + uninstall-privsolibLTLIBRARIES + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -ruN evolution-2.12.2.orig/widgets/text/Makefile.in evolution-2.12.2/widgets/text/Makefile.in +--- evolution-2.12.2.orig/widgets/text/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/widgets/text/Makefile.in 2007-12-05 15:55:04.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,12 +14,16 @@ + + @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 +@@ -31,66 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = widgets/text +-DIST_COMMON = $(libetextinclude_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(privsolibdir)" \ +- "$(DESTDIR)$(libetextincludedir)" +-privsolibLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(privsolib_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-libetext_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ +- $(top_builddir)/e-util/libeutil.la \ +- $(top_builddir)/a11y/libevolution-a11y.la \ +- $(top_builddir)/widgets/table/libetable.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-am_libetext_la_OBJECTS = e-entry.lo e-completion-match.lo \ +- e-completion.lo e-completion-callbacks.lo e-completion-view.lo \ +- e-table-text-model.lo e-text-model-repos.lo e-text-model.lo \ +- e-text-model-uri.lo e-text.lo +-libetext_la_OBJECTS = $(am_libetext_la_OBJECTS) +-libetext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libetext_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +-depcomp = $(SHELL) $(top_srcdir)/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) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-SOURCES = $(libetext_la_SOURCES) +-DIST_SOURCES = $(libetext_la_SOURCES) +-libetextincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-HEADERS = $(libetextinclude_HEADERS) +-ETAGS = etags +-CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -124,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -135,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -160,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -185,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -193,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -251,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -275,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -299,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -307,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -314,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -323,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -345,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -375,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -394,20 +384,20 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-text\" + ++ + privsolib_LTLIBRARIES = libetext.la ++ + libetext_la_SOURCES = \ + e-entry.c \ + e-completion-match.c \ +@@ -420,7 +410,9 @@ + e-text-model-uri.c \ + e-text.c + ++ + libetextincludedir = $(privincludedir)/text ++ + libetextinclude_HEADERS = \ + e-entry.h \ + e-completion-match.h \ +@@ -433,7 +425,9 @@ + e-text-model-uri.h \ + e-text.h + ++ + libetext_la_LDFLAGS = $(NO_UNDEFINED) ++ + libetext_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ +@@ -442,71 +436,96 @@ + $(GNOME_PLATFORM_LIBS) \ + $(REGEX_LIBS) + ++subdir = widgets/text ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(privsolib_LTLIBRARIES) ++ ++@OS_WIN32_TRUE@libetext_la_DEPENDENCIES = \ ++@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la \ ++@OS_WIN32_TRUE@ $(top_builddir)/widgets/table/libetable.la ++@OS_WIN32_FALSE@libetext_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la \ ++@OS_WIN32_FALSE@ $(top_builddir)/widgets/table/libetable.la ++am_libetext_la_OBJECTS = e-entry.lo e-completion-match.lo \ ++ e-completion.lo e-completion-callbacks.lo e-completion-view.lo \ ++ e-table-text-model.lo e-text-model-repos.lo e-text-model.lo \ ++ e-text-model-uri.lo e-text.lo ++libetext_la_OBJECTS = $(am_libetext_la_OBJECTS) ++ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-completion-callbacks.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-completion-match.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-completion-view.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-completion.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-entry.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-table-text-model.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-text-model-repos.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-text-model-uri.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/e-text-model.Plo ./$(DEPDIR)/e-text.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DIST_SOURCES = $(libetext_la_SOURCES) ++HEADERS = $(libetextinclude_HEADERS) ++ ++DIST_COMMON = $(libetextinclude_HEADERS) $(srcdir)/Makefile.in \ ++ Makefile.am ++SOURCES = $(libetext_la_SOURCES) ++ + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/text/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu widgets/text/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++privsolibLTLIBRARIES_INSTALL = $(INSTALL) + install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ ++ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ + else :; fi; \ + done + + uninstall-privsolibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ + done + + clean-privsolibLTLIBRARIES: + -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) + @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ ++ test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libetext.la: $(libetext_la_OBJECTS) $(libetext_la_DEPENDENCIES) +- $(libetext_la_LINK) -rpath $(privsolibdir) $(libetext_la_OBJECTS) $(libetext_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(privsolibdir) $(libetext_la_LDFLAGS) $(libetext_la_OBJECTS) $(libetext_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) ++ -rm -f *.$(OBJEXT) core *.core + + distclean-compile: + -rm -f *.tab.c +@@ -523,49 +542,74 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-text.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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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) '$<'` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + + .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" \ ++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCC_TRUE@ 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 $@ $< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++libetextincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libetextincludeHEADERS: $(libetextinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(libetextincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libetextincludedir)" ++ $(mkinstalldirs) $(DESTDIR)$(libetextincludedir) + @list='$(libetextinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(libetextincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libetextincludedir)/$$f'"; \ +- $(libetextincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libetextincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(libetextincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetextincludedir)/$$f"; \ ++ $(libetextincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetextincludedir)/$$f; \ + done + + uninstall-libetextincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libetextinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(libetextincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libetextincludedir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(libetextincludedir)/$$f"; \ ++ rm -f $(DESTDIR)$(libetextincludedir)/$$f; \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -574,7 +618,6 @@ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -586,11 +629,10 @@ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -613,23 +655,28 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = ../.. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -643,10 +690,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) ++ + installdirs: +- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(libetextincludedir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(libetextincludedir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -666,7 +712,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -680,14 +726,12 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags ++ distclean-libtool distclean-tags + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: +@@ -695,20 +739,12 @@ + install-data-am: install-libetextincludeHEADERS \ + install-privsolibLTLIBRARIES + +-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 +@@ -729,26 +765,22 @@ + + ps-am: + +-uninstall-am: uninstall-libetextincludeHEADERS \ ++uninstall-am: uninstall-info-am uninstall-libetextincludeHEADERS \ + uninstall-privsolibLTLIBRARIES + +-.MAKE: install-am install-strip +- + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-privsolibLTLIBRARIES 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-libetextincludeHEADERS install-man install-pdf \ +- install-pdf-am install-privsolibLTLIBRARIES install-ps \ +- install-ps-am 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-libetextincludeHEADERS \ +- uninstall-privsolibLTLIBRARIES ++ distclean-tags distdir dvi dvi-am info info-am install \ ++ install-am install-data install-data-am install-exec \ ++ install-exec-am install-info install-info-am \ ++ install-libetextincludeHEADERS install-man \ ++ install-privsolibLTLIBRARIES 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-info-am \ ++ uninstall-libetextincludeHEADERS uninstall-privsolibLTLIBRARIES + + # 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 -ruN evolution-2.12.2.orig/win32/Makefile.in evolution-2.12.2/win32/Makefile.in +--- evolution-2.12.2.orig/win32/Makefile.in 2007-12-05 15:50:05.000000000 +0100 ++++ evolution-2.12.2/win32/Makefile.in 2007-12-05 15:55:04.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# 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,16 @@ + + @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 +@@ -30,26 +35,13 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = win32 +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A11Y_CFLAGS = @A11Y_CFLAGS@ + A11Y_LIBS = @A11Y_LIBS@ + ACLOCAL = @ACLOCAL@ + ALL_LINGUAS = @ALL_LINGUAS@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -83,6 +75,8 @@ + DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ + DATASERVER_IDL = @DATASERVER_IDL@ + DBUS_VERSION = @DBUS_VERSION@ ++DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ ++DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEVELOPMENT = @DEVELOPMENT@ +@@ -94,6 +88,30 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ ++ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ ++ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ ++ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ ++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ ++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ++ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ ++ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ ++ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ ++ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ ++ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ ++ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ ++ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ ++ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ ++ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ ++ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ ++ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ ++ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ ++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ ++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ ++ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ ++ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ ++ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ ++ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ + EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ + EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +@@ -119,6 +137,8 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ ++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -144,7 +164,15 @@ + GTKHTML_LIBS = @GTKHTML_LIBS@ + HAL_CFLAGS = @HAL_CFLAGS@ + HAL_LIBS = @HAL_LIBS@ ++HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ ++HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ ++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ ++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ + HAVE_JW = @HAVE_JW@ ++HAVE_JW_FALSE = @HAVE_JW_FALSE@ ++HAVE_JW_TRUE = @HAVE_JW_TRUE@ ++HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ ++HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + ICONV_CFLAGS = @ICONV_CFLAGS@ +@@ -152,7 +180,6 @@ + IDL_INCLUDES = @IDL_INCLUDES@ + IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ + IMPORTERS_LIBS = @IMPORTERS_LIBS@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -210,22 +237,26 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ + MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ + MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ + MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +-MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ + MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MSGMERGE = @MSGMERGE@ + NMN_CFLAGS = @NMN_CFLAGS@ + NMN_LIBS = @NMN_LIBS@ + NM_CFLAGS = @NM_CFLAGS@ + NM_LIBS = @NM_LIBS@ ++NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ ++NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ ++NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ ++NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ + NO_UNDEFINED = @NO_UNDEFINED@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +@@ -234,6 +265,8 @@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ ++OS_WIN32_FALSE = @OS_WIN32_FALSE@ ++OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -258,6 +291,7 @@ + PURIFY = @PURIFY@ + RANLIB = @RANLIB@ + REGEX_LIBS = @REGEX_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SHELL_CFLAGS = @SHELL_CFLAGS@ +@@ -266,6 +300,8 @@ + SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ + SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ + STRIP = @STRIP@ ++SUNLDAP_FALSE = @SUNLDAP_FALSE@ ++SUNLDAP_TRUE = @SUNLDAP_TRUE@ + THREADS_CFLAGS = @THREADS_CFLAGS@ + THREADS_LIBS = @THREADS_LIBS@ + TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +@@ -273,7 +309,6 @@ + UPGRADE_REVISION = @UPGRADE_REVISION@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +-WARN_CFLAGS = @WARN_CFLAGS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ +@@ -282,21 +317,19 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + 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@ + all_plugins_base = @all_plugins_base@ + all_plugins_experimental = @all_plugins_experimental@ + all_plugins_standard = @all_plugins_standard@ ++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@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + bindir_in_server_file = @bindir_in_server_file@ + build = @build@ +@@ -304,7 +337,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + componentdir = @componentdir@ + componentdir_in_server_file = @componentdir_in_server_file@ + datadir = @datadir@ +@@ -334,7 +366,6 @@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ + plugindir = @plugindir@ +@@ -353,11 +384,8 @@ + serverdir = @serverdir@ + sharedstatedir = @sharedstatedir@ + soundsdir = @soundsdir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + viewsdir = @viewsdir@ + EXTRA_DIST = \ + dummy.la \ +@@ -369,6 +397,7 @@ + libevolution-mail.def \ + libfilter.def + ++ + @OS_WIN32_TRUE@BOOTSTRAP_LIBS = \ + @OS_WIN32_TRUE@ libemiscwidgets.la \ + @OS_WIN32_TRUE@ libetable.la \ +@@ -378,69 +407,65 @@ + @OS_WIN32_TRUE@ libevolution-mail.la \ + @OS_WIN32_TRUE@ libfilter.la + ++ + noinst_DATA = $(BOOTSTRAP_LIBS) ++ + CLEANFILES = $(BOOTSTRAP_LIBS) ++subdir = win32 ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(noinst_DATA) ++ ++DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/Makefile'; \ ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu win32/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + 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"; \ ++ $(mkinstalldirs) "$(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; \ +@@ -454,6 +479,7 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: + install: install-am + install-exec: install-exec-am +@@ -475,7 +501,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -486,34 +512,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -532,20 +548,17 @@ + + ps-am: + +-uninstall-am: +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am + + + # Yes, it's a bit silly to repeat the same command sequence here diff --git a/debian/patches/75_automatic_contacts.patch b/debian/patches/75_automatic_contacts.patch new file mode 100644 index 0000000000..7986b86409 --- /dev/null +++ b/debian/patches/75_automatic_contacts.patch @@ -0,0 +1,25 @@ +diff -ruN evolution-2.12.2.orig/plugins/bbdb/bbdb.c evolution-2.12.2/plugins/bbdb/bbdb.c +--- evolution-2.12.2.orig/plugins/bbdb/bbdb.c 2007-12-05 15:50:03.000000000 +0100 ++++ evolution-2.12.2/plugins/bbdb/bbdb.c 2007-12-05 16:23:22.000000000 +0100 +@@ -271,9 +271,19 @@ + gboolean status; + GError *error = NULL; + +- gconf = gconf_client_get_default (); ++ gboolean enable = TRUE; ++ gconf = gconf_client_get_default (); ++ ++ /* Check to see if we're supposed to be running */ ++ if (type == AUTOMATIC_CONTACTS_ADDRESSBOOK) ++ enable = gconf_client_get_bool (gconf GCONF_KEY_ENABLE NULL); ++ if (!enable) { ++ g_object_unref (G_OBJECT (gconf)); ++ return NULL; ++ } ++ + +- /* Open the appropriate addresbook. */ ++ /* Open the appropriate addresbook. */ + if (type == GAIM_ADDRESSBOOK) + uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL); + else From 3ca3fc12e1e332d3e4920d09c6929cd8b52b7a45 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Thu, 6 Dec 2007 16:45:49 +0000 Subject: [PATCH 20/60] Conflict with older evolution-plugins and evolution-plugins-experimental to ensure full upgrades (closes: #454473) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@945 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 ++++-- debian/control | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02c083aeff..2e4422d9bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -evolution (2.12.2-2) unstable; urgency=low +evolution (2.12.2-2) UNRELEASED; urgency=low * Add patch with autoreconfisation - fixes lost translations (closes: #454434) * Add patch to fix automatic contacts (closes: #454435) + * Conflict with older evolution-plugins and evolution-plugins-experimental + to ensure full upgrades (closes: #454473) - -- Heikki Henriksen Wed, 05 Dec 2007 16:33:36 +0100 + -- Heikki Henriksen Thu, 06 Dec 2007 17:43:12 +0100 evolution (2.12.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 208a4c6991..f70cefd68a 100644 --- a/debian/control +++ b/debian/control @@ -90,7 +90,9 @@ Provides: mail-reader, imap-client Replaces: evolution-plugins (<= 2.6.1-2), evolution-common (<< 2.6.2-3) -Conflicts: evolution-exchange (<< 2.11.90) +Conflicts: evolution-exchange (<< 2.11.90), + evolution-plugins (<< 2.11.90), + evolution-plugins-experimental (<< 2.11.90) Description: groupware suite with mail client and organizer Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. From 97a18ed58d3fe74ac7e68aee1a5740ebaeae3e51 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Wed, 12 Dec 2007 21:11:32 +0000 Subject: [PATCH 21/60] Add recommends evolution-webcal (closes: #455598) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@951 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/control | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e4422d9bf..65cdacfb68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ evolution (2.12.2-2) UNRELEASED; urgency=low * Add patch to fix automatic contacts (closes: #454435) * Conflict with older evolution-plugins and evolution-plugins-experimental to ensure full upgrades (closes: #454473) + * Add recommends evolution-webcal (closes: #455598) - -- Heikki Henriksen Thu, 06 Dec 2007 17:43:12 +0100 + -- Heikki Henriksen Wed, 12 Dec 2007 22:09:48 +0100 evolution (2.12.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index f70cefd68a..fe66335994 100644 --- a/debian/control +++ b/debian/control @@ -77,6 +77,7 @@ Depends: ${shlibs:Depends}, Recommends: gnome-pilot-conduits (>= 2.0.9), gnome-desktop-data, evolution-plugins, + evolution-webcal, yelp, bogofilter | spamassassin Suggests: bug-buddy, From 88259a75cb4575d083800a16f38f152fab50260d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Tue, 22 Jan 2008 07:21:19 +0000 Subject: [PATCH 22/60] New upstream release (2.12.3) Remove configure flags --with-nspr-includes and --with-nss-includes Remove debian/patches/05_autoreconf.patch (did not really fix #454434) Remove debian/patches/75_automatic_contacts.patch (applied upstream) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@952 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 14 +- debian/patches/05_autoreconf.patch | 119151 ------------------ debian/patches/75_automatic_contacts.patch | 25 - debian/rules | 2 - 4 files changed, 9 insertions(+), 119183 deletions(-) delete mode 100644 debian/patches/05_autoreconf.patch delete mode 100644 debian/patches/75_automatic_contacts.patch diff --git a/debian/changelog b/debian/changelog index 65cdacfb68..9bf24cecc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ -evolution (2.12.2-2) UNRELEASED; urgency=low +evolution (2.12.3-1) unstable; urgency=low - * Add patch with autoreconfisation - - fixes lost translations (closes: #454434) - * Add patch to fix automatic contacts (closes: #454435) + [ Heikki Henriksen ] * Conflict with older evolution-plugins and evolution-plugins-experimental to ensure full upgrades (closes: #454473) * Add recommends evolution-webcal (closes: #455598) - -- Heikki Henriksen Wed, 12 Dec 2007 22:09:48 +0100 + [ Oystein Gisnas ] + * New upstream release (bugfixes and translations) + (closes: #454435, #458728, #443483) + * Remove configure flags --with-nspr-includes and --with-nss-includes + (closes: #461312, #460615, #460683) + + -- Oystein Gisnas Tue, 22 Jan 2008 08:19:08 +0100 evolution (2.12.2-1) unstable; urgency=low diff --git a/debian/patches/05_autoreconf.patch b/debian/patches/05_autoreconf.patch deleted file mode 100644 index 6c62207143..0000000000 --- a/debian/patches/05_autoreconf.patch +++ /dev/null @@ -1,119151 +0,0 @@ -diff -ruN evolution-2.12.2.orig/a11y/addressbook/Makefile.in evolution-2.12.2/a11y/addressbook/Makefile.in ---- evolution-2.12.2.orig/a11y/addressbook/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/a11y/addressbook/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = a11y/addressbook --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_addressbook_a11y_la_DEPENDENCIES = \ -- $(WIN32_BOOTSTRAP_LIBS) $(am__DEPENDENCIES_1) --am_libevolution_addressbook_a11y_la_OBJECTS = ea-minicard.lo \ -- ea-minicard-view.lo ea-addressbook-view.lo ea-addressbook.lo --libevolution_addressbook_a11y_la_OBJECTS = \ -- $(am_libevolution_addressbook_a11y_la_OBJECTS) --libevolution_addressbook_a11y_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_addressbook_a11y_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) --DIST_SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,17 +384,16 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la - -+ - privsolib_LTLIBRARIES = libevolution-addressbook-a11y.la -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-a11y\" \ - -I$(top_srcdir) \ -@@ -407,6 +404,7 @@ - -DG_DISABLE_DEPRECATED \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - libevolution_addressbook_a11y_la_SOURCES = \ - ea-minicard.c \ - ea-minicard.h \ -@@ -417,76 +415,89 @@ - ea-addressbook.c \ - ea-addressbook.h - -+ - libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED) -+ - libevolution_addressbook_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+subdir = a11y/addressbook -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libevolution_addressbook_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la -+@OS_WIN32_FALSE@libevolution_addressbook_a11y_la_DEPENDENCIES = -+am_libevolution_addressbook_a11y_la_OBJECTS = ea-minicard.lo \ -+ ea-minicard-view.lo ea-addressbook-view.lo ea-addressbook.lo -+libevolution_addressbook_a11y_la_OBJECTS = \ -+ $(am_libevolution_addressbook_a11y_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-addressbook-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-addressbook.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-minicard-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-minicard.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_addressbook_a11y_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/addressbook/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu a11y/addressbook/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-addressbook-a11y.la: $(libevolution_addressbook_a11y_la_OBJECTS) $(libevolution_addressbook_a11y_la_DEPENDENCIES) -- $(libevolution_addressbook_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_addressbook_a11y_la_OBJECTS) $(libevolution_addressbook_a11y_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_addressbook_a11y_la_LDFLAGS) $(libevolution_addressbook_a11y_la_OBJECTS) $(libevolution_addressbook_a11y_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -497,25 +508,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ea-minicard.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -523,6 +546,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -531,7 +566,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -543,11 +577,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -570,23 +603,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -600,10 +638,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -623,7 +660,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +674,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -685,23 +712,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/a11y/calendar/Makefile.in evolution-2.12.2/a11y/calendar/Makefile.in ---- evolution-2.12.2.orig/a11y/calendar/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/a11y/calendar/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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. -@@ -19,11 +19,16 @@ - # for debug - #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror - -+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 -@@ -35,63 +40,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = a11y/calendar --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_calendar_a11y_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/a11y/libevolution-a11y.la \ -- $(am__DEPENDENCIES_1) --am_libevolution_calendar_a11y_la_OBJECTS = ea-calendar.lo \ -- ea-calendar-helpers.lo ea-cal-view.lo ea-cal-view-event.lo \ -- ea-day-view.lo ea-day-view-main-item.lo ea-day-view-cell.lo \ -- ea-week-view.lo ea-week-view-main-item.lo ea-week-view-cell.lo \ -- ea-jump-button.lo ea-gnome-calendar.lo --libevolution_calendar_a11y_la_OBJECTS = \ -- $(am_libevolution_calendar_a11y_la_OBJECTS) --libevolution_calendar_a11y_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_calendar_a11y_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_calendar_a11y_la_SOURCES) --DIST_SOURCES = $(libevolution_calendar_a11y_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -125,6 +80,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -136,6 +93,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -161,6 +142,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -186,7 +169,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -194,7 +185,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -252,22 +242,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -276,6 +270,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -300,6 +296,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -308,6 +305,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -315,7 +314,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -324,21 +322,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -346,7 +342,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -376,7 +371,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -395,17 +389,17 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-calendar.la - -+ - privsolib_LTLIBRARIES = libevolution-calendar-a11y.la -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-a11y\" \ - -I$(top_srcdir) \ -@@ -415,6 +409,7 @@ - -I$(top_srcdir)/a11y \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - libevolution_calendar_a11y_la_SOURCES = \ - ea-calendar.c \ - ea-calendar.h \ -@@ -441,77 +436,103 @@ - ea-gnome-calendar.c \ - ea-gnome-calendar.h - -+ - libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED) -+ - libevolution_calendar_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(EVOLUTION_CALENDAR_LIBS) - -+subdir = a11y/calendar -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libevolution_calendar_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-calendar.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la -+@OS_WIN32_FALSE@libevolution_calendar_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la -+am_libevolution_calendar_a11y_la_OBJECTS = ea-calendar.lo \ -+ ea-calendar-helpers.lo ea-cal-view.lo ea-cal-view-event.lo \ -+ ea-day-view.lo ea-day-view-main-item.lo ea-day-view-cell.lo \ -+ ea-week-view.lo ea-week-view-main-item.lo ea-week-view-cell.lo \ -+ ea-jump-button.lo ea-gnome-calendar.lo -+libevolution_calendar_a11y_la_OBJECTS = \ -+ $(am_libevolution_calendar_a11y_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-cal-view-event.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-cal-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-calendar-helpers.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-day-view-cell.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-day-view-main-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-day-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-gnome-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-jump-button.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-week-view-cell.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-week-view-main-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-week-view.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_calendar_a11y_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_calendar_a11y_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/calendar/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu a11y/calendar/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-calendar-a11y.la: $(libevolution_calendar_a11y_la_OBJECTS) $(libevolution_calendar_a11y_la_DEPENDENCIES) -- $(libevolution_calendar_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_calendar_a11y_la_OBJECTS) $(libevolution_calendar_a11y_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_calendar_a11y_la_LDFLAGS) $(libevolution_calendar_a11y_la_OBJECTS) $(libevolution_calendar_a11y_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -530,25 +551,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ea-week-view.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -556,6 +589,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -564,7 +609,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -576,11 +620,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -603,23 +646,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -633,10 +681,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -656,7 +703,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -670,34 +717,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -718,23 +755,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/a11y/e-table/Makefile.in evolution-2.12.2/a11y/e-table/Makefile.in ---- evolution-2.12.2.orig/a11y/e-table/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/a11y/e-table/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,53 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = a11y/e-table --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libgal_a11y_etable_la_LIBADD = --am_libgal_a11y_etable_la_OBJECTS = gal-a11y-e-tree.lo \ -- gal-a11y-e-tree-factory.lo gal-a11y-e-cell.lo \ -- gal-a11y-e-cell-text.lo gal-a11y-e-cell-tree.lo \ -- gal-a11y-e-cell-toggle.lo gal-a11y-e-cell-popup.lo \ -- gal-a11y-e-cell-registry.lo gal-a11y-e-cell-vbox.lo \ -- gal-a11y-e-table.lo gal-a11y-e-table-item.lo \ -- gal-a11y-e-table-item-factory.lo \ -- gal-a11y-e-table-click-to-add.lo \ -- gal-a11y-e-table-column-header.lo \ -- gal-a11y-e-table-click-to-add-factory.lo \ -- gal-a11y-e-table-factory.lo --libgal_a11y_etable_la_OBJECTS = $(am_libgal_a11y_etable_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libgal_a11y_etable_la_SOURCES) --DIST_SOURCES = $(libgal_a11y_etable_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -110,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -121,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -146,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -171,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -179,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -237,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -261,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -293,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -300,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -309,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -331,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -361,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -380,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -392,7 +393,9 @@ - $(GNOME_PLATFORM_CFLAGS) \ - -DG_LOG_DOMAIN=\"e-table\" - -+ - noinst_LTLIBRARIES = libgal-a11y-etable.la -+ - libgal_a11y_etable_la_SOURCES = \ - gal-a11y-e-tree.c \ - gal-a11y-e-tree-factory.c \ -@@ -427,53 +430,81 @@ - gal-a11y-e-table-item-factory.h \ - gal-a11y-e-table-factory.h - -+subdir = a11y/e-table -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libgal_a11y_etable_la_LDFLAGS = -+libgal_a11y_etable_la_LIBADD = -+am_libgal_a11y_etable_la_OBJECTS = gal-a11y-e-tree.lo \ -+ gal-a11y-e-tree-factory.lo gal-a11y-e-cell.lo \ -+ gal-a11y-e-cell-text.lo gal-a11y-e-cell-tree.lo \ -+ gal-a11y-e-cell-toggle.lo gal-a11y-e-cell-popup.lo \ -+ gal-a11y-e-cell-registry.lo gal-a11y-e-cell-vbox.lo \ -+ gal-a11y-e-table.lo gal-a11y-e-table-item.lo \ -+ gal-a11y-e-table-item-factory.lo \ -+ gal-a11y-e-table-click-to-add.lo \ -+ gal-a11y-e-table-column-header.lo \ -+ gal-a11y-e-table-click-to-add-factory.lo \ -+ gal-a11y-e-table-factory.lo -+libgal_a11y_etable_la_OBJECTS = $(am_libgal_a11y_etable_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gal-a11y-e-cell-popup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-registry.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-text.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-toggle.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-tree.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell-vbox.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-cell.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-click-to-add-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-click-to-add.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-column-header.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-item-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-table.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-tree-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-tree.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libgal_a11y_etable_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libgal_a11y_etable_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/e-table/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu a11y/e-table/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgal-a11y-etable.la: $(libgal_a11y_etable_la_OBJECTS) $(libgal_a11y_etable_la_DEPENDENCIES) -- $(LINK) $(libgal_a11y_etable_la_OBJECTS) $(libgal_a11y_etable_la_LIBADD) $(LIBS) -+ $(LINK) $(libgal_a11y_etable_la_LDFLAGS) $(libgal_a11y_etable_la_OBJECTS) $(libgal_a11y_etable_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -496,25 +527,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-a11y-e-tree.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -522,6 +565,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -530,7 +585,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -542,11 +596,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -569,23 +622,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -599,6 +657,7 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: - install: install-am - install-exec: install-exec-am -@@ -619,7 +678,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -633,34 +692,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: - --install-dvi: install-dvi-am -- - install-exec-am: - --install-html: install-html-am -- - install-info: install-info-am - - install-man: - --install-pdf: install-pdf-am -- --install-ps: install-ps-am -- - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -681,22 +730,18 @@ - - 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 \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-info install-info-am install-man \ - install-strip installcheck 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 -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool 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 -ruN evolution-2.12.2.orig/a11y/e-text/Makefile.in evolution-2.12.2/a11y/e-text/Makefile.in ---- evolution-2.12.2.orig/a11y/e-text/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/a11y/e-text/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,44 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = a11y/e-text --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libgal_a11y_etext_la_LIBADD = --am_libgal_a11y_etext_la_OBJECTS = gal-a11y-e-text-factory.lo \ -- gal-a11y-e-text.lo --libgal_a11y_etext_la_OBJECTS = $(am_libgal_a11y_etext_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libgal_a11y_etext_la_SOURCES) --DIST_SOURCES = $(libgal_a11y_etext_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -101,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -112,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -137,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -162,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -170,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -228,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -252,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -276,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -284,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -291,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -300,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -322,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -352,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -371,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -383,60 +393,67 @@ - $(GNOME_PLATFORM_CFLAGS) \ - -DG_LOG_DOMAIN=\"e-text\" - -+ - noinst_LTLIBRARIES = libgal-a11y-etext.la -+ - libgal_a11y_etext_la_SOURCES = \ - gal-a11y-e-text-factory.c \ - gal-a11y-e-text.c \ - gal-a11y-e-text-factory.h \ - gal-a11y-e-text.h - -+subdir = a11y/e-text -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libgal_a11y_etext_la_LDFLAGS = -+libgal_a11y_etext_la_LIBADD = -+am_libgal_a11y_etext_la_OBJECTS = gal-a11y-e-text-factory.lo \ -+ gal-a11y-e-text.lo -+libgal_a11y_etext_la_OBJECTS = $(am_libgal_a11y_etext_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gal-a11y-e-text-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-e-text.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libgal_a11y_etext_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libgal_a11y_etext_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/e-text/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu a11y/e-text/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgal-a11y-etext.la: $(libgal_a11y_etext_la_OBJECTS) $(libgal_a11y_etext_la_DEPENDENCIES) -- $(LINK) $(libgal_a11y_etext_la_OBJECTS) $(libgal_a11y_etext_la_LIBADD) $(LIBS) -+ $(LINK) $(libgal_a11y_etext_la_LDFLAGS) $(libgal_a11y_etext_la_OBJECTS) $(libgal_a11y_etext_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -445,25 +462,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-a11y-e-text.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -471,6 +500,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -479,7 +520,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -491,11 +531,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -518,23 +557,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -548,6 +592,7 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: - install: install-am - install-exec: install-exec-am -@@ -568,7 +613,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -582,34 +627,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: - --install-dvi: install-dvi-am -- - install-exec-am: - --install-html: install-html-am -- - install-info: install-info-am - - install-man: - --install-pdf: install-pdf-am -- --install-ps: install-ps-am -- - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -630,22 +665,18 @@ - - 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 \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-info install-info-am install-man \ - install-strip installcheck 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 -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool 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 -ruN evolution-2.12.2.orig/a11y/Makefile.in evolution-2.12.2/a11y/Makefile.in ---- evolution-2.12.2.orig/a11y/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/a11y/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,67 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = a11y --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_a11y_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- e-text/libgal-a11y-etext.la e-table/libgal-a11y-etable.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_libevolution_a11y_la_OBJECTS = ea-cell-table.lo gal-a11y-util.lo --libevolution_a11y_la_OBJECTS = $(am_libevolution_a11y_la_OBJECTS) --libevolution_a11y_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_a11y_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_a11y_la_SOURCES) --DIST_SOURCES = $(libevolution_a11y_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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -124,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -135,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -160,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -185,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -193,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -251,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -275,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -299,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -307,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -314,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -323,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -345,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -375,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -394,27 +384,28 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - - # Somewhat odd looking to have "." in SUBDIRS, but apparently it works? - SUBDIRS = e-text e-table . calendar widgets addressbook -+ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libetable.la \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la - - -+ - # for debug - #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror - privsolib_LTLIBRARIES = libevolution-a11y.la -+ - INCLUDES = \ - $(A11Y_CFLAGS) - -+ - libevolution_a11y_la_SOURCES = \ - ea-factory.h \ - ea-cell-table.h \ -@@ -423,7 +414,9 @@ - gal-a11y-util.h \ - gal-a11y-factory.h - -+ - libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED) -+ - libevolution_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - e-text/libgal-a11y-etext.la \ -@@ -431,71 +424,92 @@ - $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) - -+subdir = a11y -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libevolution_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libetable.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ -+@OS_WIN32_TRUE@ e-text/libgal-a11y-etext.la \ -+@OS_WIN32_TRUE@ e-table/libgal-a11y-etable.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la -+@OS_WIN32_FALSE@libevolution_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ e-text/libgal-a11y-etext.la \ -+@OS_WIN32_FALSE@ e-table/libgal-a11y-etable.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la -+am_libevolution_a11y_la_OBJECTS = ea-cell-table.lo gal-a11y-util.lo -+libevolution_a11y_la_OBJECTS = $(am_libevolution_a11y_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-cell-table.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-a11y-util.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_a11y_la_SOURCES) -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) -+SOURCES = $(libevolution_a11y_la_SOURCES) -+ - all: all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu a11y/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-a11y.la: $(libevolution_a11y_la_OBJECTS) $(libevolution_a11y_la_DEPENDENCIES) -- $(libevolution_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_a11y_la_OBJECTS) $(libevolution_a11y_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_a11y_la_LDFLAGS) $(libevolution_a11y_la_OBJECTS) $(libevolution_a11y_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -504,25 +518,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-a11y-util.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -530,6 +556,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, -@@ -537,13 +567,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -555,20 +579,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -589,7 +608,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -600,6 +619,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -608,22 +635,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -633,11 +657,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -660,23 +683,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -687,19 +715,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -709,9 +733,8 @@ - all-am: Makefile $(LTLIBRARIES) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -731,7 +754,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -745,34 +768,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -793,26 +806,28 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - --.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-privsolibLTLIBRARIES ctags ctags-recursive distclean \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-privsolibLTLIBRARIES \ -+ 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-privsolibLTLIBRARIES \ -- 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-privsolibLTLIBRARIES -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-privsolibLTLIBRARIES install-recursive install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ installdirs-recursive maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-privsolibLTLIBRARIES \ -+ uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/a11y/widgets/Makefile.in evolution-2.12.2/a11y/widgets/Makefile.in ---- evolution-2.12.2.orig/a11y/widgets/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/a11y/widgets/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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. -@@ -17,11 +17,16 @@ - # for debug - #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror - -+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 -@@ -33,61 +38,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = a11y/widgets --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_widgets_a11y_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/a11y/libevolution-a11y.la \ -- $(am__DEPENDENCIES_1) --am_libevolution_widgets_a11y_la_OBJECTS = ea-calendar-item.lo \ -- ea-calendar-cell.lo ea-combo-button.lo ea-expander.lo \ -- ea-widgets.lo --libevolution_widgets_a11y_la_OBJECTS = \ -- $(am_libevolution_widgets_a11y_la_OBJECTS) --libevolution_widgets_a11y_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(libevolution_widgets_a11y_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_widgets_a11y_la_SOURCES) --DIST_SOURCES = $(libevolution_widgets_a11y_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -121,6 +78,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -132,6 +91,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -157,6 +140,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -182,7 +167,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -190,7 +183,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -248,22 +240,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -272,6 +268,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -296,6 +294,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -304,6 +303,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -311,7 +312,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -320,21 +320,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -342,7 +340,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -372,7 +369,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -391,14 +387,14 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la -+ - privsolib_LTLIBRARIES = libevolution-widgets-a11y.la -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-a11y\" \ - -I$(top_srcdir) \ -@@ -406,6 +402,7 @@ - -I$(top_srcdir)/widgets \ - $(E_WIDGETS_CFLAGS) - -+ - libevolution_widgets_a11y_la_SOURCES = \ - ea-calendar-item.c \ - ea-calendar-item.h \ -@@ -418,77 +415,93 @@ - ea-widgets.c \ - ea-widgets.h - -+ - libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED) -+ - libevolution_widgets_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(E_WIDGETS_LIBS) - -+subdir = a11y/widgets -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libevolution_widgets_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la -+@OS_WIN32_FALSE@libevolution_widgets_a11y_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la -+am_libevolution_widgets_a11y_la_OBJECTS = ea-calendar-item.lo \ -+ ea-calendar-cell.lo ea-combo-button.lo ea-expander.lo \ -+ ea-widgets.lo -+libevolution_widgets_a11y_la_OBJECTS = \ -+ $(am_libevolution_widgets_a11y_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ea-calendar-cell.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-calendar-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-combo-button.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-expander.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ea-widgets.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_widgets_a11y_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_widgets_a11y_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu a11y/widgets/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu a11y/widgets/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-widgets-a11y.la: $(libevolution_widgets_a11y_la_OBJECTS) $(libevolution_widgets_a11y_la_DEPENDENCIES) -- $(libevolution_widgets_a11y_la_LINK) -rpath $(privsolibdir) $(libevolution_widgets_a11y_la_OBJECTS) $(libevolution_widgets_a11y_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_widgets_a11y_la_LDFLAGS) $(libevolution_widgets_a11y_la_OBJECTS) $(libevolution_widgets_a11y_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -500,25 +513,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ea-widgets.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -526,6 +551,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -534,7 +571,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -546,11 +582,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -573,23 +608,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -603,10 +643,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -626,7 +665,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -640,34 +679,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -688,23 +717,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/aclocal.m4 evolution-2.12.2/aclocal.m4 ---- evolution-2.12.2.orig/aclocal.m4 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/aclocal.m4 2007-12-05 15:54:42.000000000 +0100 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.7.9 -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,120 +11,437 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.61],, --[m4_fatal([this file was generated for autoconf 2.61. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+# evolution/acinclude.m4 -+# shared configure.in hacks between Evolution and Connector - --# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# serial 1 - --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --# (This private macro should not be called outside this file.) --AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.10' --dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to --dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10], [], -- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+# EVO_PURIFY_SUPPORT -+# Add --enable-purify. If the user turns it on, subst PURIFY and set -+# the automake conditional ENABLE_PURIFY -+AC_DEFUN([EVO_PURIFY_SUPPORT], [ -+ AC_ARG_ENABLE([purify], -+ AC_HELP_STRING([--enable-purify], -+ [Enable support for building executables with Purify.]),,[enable_purify=no]) -+ AC_PATH_PROG(PURIFY, purify, impure) -+ AC_ARG_WITH([purify-options], -+ AC_HELP_STRING([--with-purify-options=OPTIONS], -+ [Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])) -+ if test "x$with_purify_options" = "xno"; then -+ with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify" -+ fi -+ if test "x$PURIFYOPTIONS" = "x"; then -+ PURIFYOPTIONS=$with_purify_options -+ fi -+ AC_SUBST(PURIFY) -+ AM_CONDITIONAL(ENABLE_PURIFY, [test x$enable_purify = xyes -a x$PURIFY != ximpure]) -+ PURIFY="$PURIFY $PURIFYOPTIONS" - ]) - --# _AM_AUTOCONF_VERSION(VERSION) --# ----------------------------- --# aclocal traces this macro to find the Autoconf version. --# This is a private macro too. Using m4_define simplifies --# the logic in aclocal, which can simply ignore this definition. --m4_define([_AM_AUTOCONF_VERSION], []) - --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10])dnl --_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+# EVO_LDAP_CHECK(default) -+# Add --with-openldap and --with-static-ldap options. --with-openldap -+# defaults to the given value if not specified. If LDAP support is -+# configured, HAVE_LDAP will be defined and the automake conditional -+# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set -+# appropriately. -+AC_DEFUN([EVO_LDAP_CHECK], [ -+ default="$1" -+ -+ AC_ARG_WITH([openldap], -+ AC_HELP_STRING([--with-openldap], -+ [Enable LDAP support in evolution])) -+ AC_ARG_WITH([static-ldap], -+ AC_HELP_STRING([--with-static-ldap], -+ [Link LDAP support statically into evolution])) -+ AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}") -+ case $ac_cv_with_openldap in -+ no|"") -+ with_openldap=no -+ ;; -+ yes) -+ with_openldap=/usr -+ ;; -+ *) -+ with_openldap=$ac_cv_with_openldap -+ LDAP_CFLAGS="-I$ac_cv_with_openldap/include" -+ LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib" -+ ;; -+ esac - --# AM_AUX_DIR_EXPAND -*- Autoconf -*- -+ if test "$with_openldap" != no; then -+ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+ case $with_static_ldap in -+ no|"") -+ with_static_ldap=no -+ ;; -+ *) -+ with_static_ldap=yes -+ ;; -+ esac -+ -+ AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [ -+ CPPFLAGS_save="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS" -+ AC_EGREP_CPP(yes, [ -+ #include "ldap.h" -+ #if LDAP_VENDOR_VERSION > 20000 -+ yes -+ #endif -+ ], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no) -+ CPPFLAGS="$CPPFLAGS_save" -+ ]) -+ if test "$ac_cv_openldap_version2" = no; then -+ AC_MSG_ERROR(evolution requires OpenLDAP version >= 2) -+ fi - --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. --# --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. --# --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir --# --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. --# --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. --# --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -+ AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv") -+ AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") -+ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") -+ AC_CHECK_LIB(lber, ber_get_tag, [ -+ if test "$with_static_ldap" = "yes"; then -+ LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS" -+ -+ # libldap might depend on OpenSSL... We need to pull -+ # in the dependency libs explicitly here since we're -+ # not using libtool for the configure test. -+ if test -f $with_openldap/lib/libldap.la; then -+ LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" -+ fi -+ else -+ LDAP_LIBS="-llber $LDAP_LIBS" -+ fi -+ AC_CHECK_LIB(ldap, ldap_open, [ -+ if test $with_static_ldap = "yes"; then -+ LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS" -+ else -+ LDAP_LIBS="-lldap $LDAP_LIBS" -+ fi], -+ LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) -+ LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS" -+ ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) - --AC_DEFUN([AM_AUX_DIR_EXPAND], --[dnl Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50])dnl --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` -+ if test -z "$LDAP_LIBS"; then -+ AC_MSG_ERROR(could not find OpenLDAP libraries) -+ fi -+ -+ AC_SUBST(LDAP_CFLAGS) -+ AC_SUBST(LDAP_LIBS) -+ fi -+ AM_CONDITIONAL(ENABLE_LDAP, test $with_openldap != no) - ]) - --# AM_CONDITIONAL -*- Autoconf -*- -+# EVO_SUNLDAP_CHECK -+# Add --with-sunldap and --with-static-sunldap options. --with-sunldap -+# defaults to the given value if not specified. If LDAP support is -+# configured, HAVE_LDAP will be defined and the automake conditional +# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set -+# appropriately, and --with-sunldap and --with-openldap is mutually exclusive. -+AC_DEFUN([EVO_SUNLDAP_CHECK], [ -+ default="$1" -+ -+ AC_ARG_WITH([sunldap], -+ AC_HELP_STRING([--with-sunldap], -+ [Enable SunLDAP support in evolution])) -+ AC_ARG_WITH([static-sunldap], -+ AC_HELP_STRING([--with-static-sunldap], -+ [Link SunLDAP support statically into evolution ])) -+ AC_CACHE_CHECK([for SunLDAP], ac_cv_with_sunldap, ac_cv_with_sunldap="${with_sunldap:=$default}") -+ case $ac_cv_with_sunldap in -+ no|"") -+ with_sunldap=no -+ ;; -+ yes) -+ with_sunldap=/usr -+ ;; -+ *) -+ with_sunldap=$ac_cv_with_sunldap -+ LDAP_CFLAGS="-I$ac_cv_with_sunldap/include" -+ LDAP_LDFLAGS="-L$ac_cv_with_sunldap/lib" -+ ;; -+ esac -+ -+ if test "$with_sunldap" != no; then -+ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) -+ AC_DEFINE(SUNLDAP, 1, [Define if you use SunLDAP]) -+ -+ case $with_static_sunldap in -+ no|"") -+ with_static_sunldap=no -+ ;; -+ *) -+ with_static_sunldap=yes -+ ;; -+ esac -+ -+ AC_CACHE_CHECK(if SunLDAP is version 2.x, ac_cv_sunldap_version2, [ -+ CPPFLAGS_save="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS" -+ AC_EGREP_CPP(yes, [ -+ #include "ldap.h" -+ #if LDAP_VENDOR_VERSION >= 500 -+ yes -+ #endif -+ ], ac_cv_sunldap_version2=yes, ac_cv_sunldap_version2=no) -+ CPPFLAGS="$CPPFLAGS_save" -+ ]) -+ if test "$ac_cv_sunldap_version2" = no; then -+ AC_MSG_ERROR(evolution requires SunLDAP version >= 2) -+ fi -+ -+ AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv") -+ AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") -+ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") -+ AC_CHECK_LIB(ldap, ldap_open, [ -+ if test $with_static_sunldap = "yes"; then -+ LDAP_LIBS="$with_sunldap/lib/libldap.a $LDAP_LIBS" -+ else -+ LDAP_LIBS="-lldap $LDAP_LIBS" -+ fi -+ if test `uname -s` != "SunOS" ; then -+ AC_CHECK_LIB(lber, ber_get_tag, [ -+ if test "$with_static_sunldap" = "yes"; then -+ LDAP_LIBS="$with_sunldap/lib/liblber.a $LDAP_LIBS" -+ # libldap might depend on OpenSSL... We need to pull -+ # in the dependency libs explicitly here since we're -+ # not using libtool for the configure test. -+ if test -f $with_sunldap/lib/libldap.la; then -+ LDAP_LIBS="`. $with_sunldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" -+ fi -+ else -+ LDAP_LIBS="-llber $LDAP_LIBS" -+ fi], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) -+ fi -+ LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS" -+ ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS) - --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 --# Free Software Foundation, Inc. -+ if test -z "$LDAP_LIBS"; then -+ AC_MSG_ERROR(could not find SunLDAP libraries) -+ fi -+ -+ AC_SUBST(LDAP_CFLAGS) -+ AC_SUBST(LDAP_LIBS) -+ fi -+ AM_CONDITIONAL(ENABLE_LDAP, test $with_sunldap != no) -+]) -+ -+# EVO_PTHREAD_CHECK -+AC_DEFUN([EVO_PTHREAD_CHECK],[ -+ PTHREAD_LIB="" -+ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", -+ [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", -+ [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", -+ [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread", -+ [AC_CHECK_FUNC(pthread_create)] -+ )] -+ )] -+ )] -+ ) -+ AC_SUBST(PTHREAD_LIB) -+ AC_PROVIDE([EVO_PTHREAD_CHECK]) -+]) -+dnl -*- mode: autoconf -*- -+ -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ AC_ARG_WITH([html-dir], -+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, -+ [with_html_dir='${datadir}/gtk-doc/html']) -+ HTML_DIR="$with_html_dir" -+ AC_SUBST(HTML_DIR) -+ -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE([gtk-doc], -+ AC_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [default=no]]),, -+ enable_gtk_doc=no) -+ -+ have_gtk_doc=no -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then -+ have_gtk_doc=yes -+ fi -+ -+ dnl do we want to do a version check? -+ifelse([$1],[],, -+ [gtk_doc_min_version=$1 -+ if test "$have_gtk_doc" = yes; then -+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) -+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ have_gtk_doc=no -+ fi -+ fi -+]) -+ if test x$enable_gtk_doc = xyes; then -+ if test "$have_gtk_doc" != yes; then -+ enable_gtk_doc=no -+ fi -+ fi -+ -+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -+]) -+ -+# PILOT_LINK_CHECK -+# Adds --with-pisock and determines the verion of the pisock - # --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. - --# serial 8 -+AC_SUBST(PISOCK_CFLAGS) -+AC_SUBST(PISOCK_LIBS) -+ -+AC_DEFUN([PILOT_LINK_HOOK],[ -+ AC_ARG_WITH([pisock], -+ AC_HELP_STRING([--with-pisock], -+ [Specify prefix for pisock files]), -+ [ -+ if test x$withval = xyes; then -+ dnl Note that an empty true branch is not valid sh syntax. -+ ifelse([$1], [], :, [$1]) -+ else -+ PISOCK_CFLAGS="-I$withval/include" -+ incdir="$withval/include" -+ PISOCK_LIBS="-L$withval/lib -lpisock -lpisync" -+ AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so") -+ if test -r $withval/lib/libpisock.so; then -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) -+ fi -+ fi -+ ]) -+ -+ if test x$PISOCK_CFLAGS = x; then -+ AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [ -+ AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock" -+ piversion_include="libpisock/pi-version.h" -+ incdir="/usr/include/libpisock" -+ ], [ -+ AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock" -+ piversion_include="$prefix/include/pi-version.h" -+ if test x$PISOCK_LIBDIR = x; then -+ incdir="$prefix/include" -+ PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync" -+ fi ], -+ AC_MSG_ERROR([Unable to find pi-version.h])) -+ ]) -+ ]) -+ fi -+ -+ if test "x$PISOCK_LIBS" = "x"; then -+ AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock -lpisync"], -+ [ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ]) -+ fi -+ -+ AC_ARG_ENABLE([pilotlinktest], -+ AC_HELP_STRING([--enable-pilotlinktest], -+ [Test for correct version of pilot-link]), -+ [testplversion=$enableval], -+ [testplversion=yes] -+ ) -+ -+ if test x$piversion_include = x; then -+ piversion_include="pi-version.h" -+ fi -+ -+ pi_major=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_VERSION'|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'` -+ pi_minor=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MAJOR'|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'` -+ pi_micro=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MINOR'|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'` -+ pi_patch=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_PATCH'|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'` -+ -+ PILOT_LINK_MAJOR="$pi_major" -+ PILOT_LINK_MINOR="$pi_minor" -+ PILOT_LINK_MICRO="$pi_micro" -+ PILOT_LINK_PATCH="$pi_patch" -+ PILOT_LINK_VERSION="$pi_major.$pi_minor.$pi_micro$pi_patch" -+ -+ if test x$testplversion = xyes; then -+ AC_MSG_CHECKING([for pilot-link version >= $1]) -+ pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ pl_mc=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ CFLAGS_save="$CFLAGS" -+ CFLAGS="$CFLAGS $PISOCK_CFLAGS" -+ AC_TRY_RUN( -+ [ -+ #include <$piversion_include> -+ int main(int argc,char *argv[]) { -+ if (PILOT_LINK_VERSION == $pl_ma) { -+ if (PILOT_LINK_MAJOR == $pl_mi) { -+ if (PILOT_LINK_MINOR >= $pl_mc) { -+ return 0; -+ } -+ } else if (PILOT_LINK_MAJOR > $pl_mi) { -+ return 0; -+ } -+ } else if (PILOT_LINK_VERSION > $pl_ma) { -+ return 0; -+ } -+ return 1; -+ } -+ ], -+ [AC_MSG_RESULT([yes (found $PILOT_LINK_VERSION)])], -+ [AC_MSG_ERROR([pilot-link >= $1 required])], -+ [AC_MSG_WARN([No action taken for crosscompile])] -+ ) -+ CFLAGS="$CFLAGS_save" -+ fi -+ -+ unset piversion_include -+ unset pi_verion -+ unset pi_major -+ unset pi_minor -+ unset pi_patch -+ unset incdir -+ unset pl_mi -+ unset pl_ma -+ unset pl_ve -+]) -+ -+AC_DEFUN([PILOT_LINK_CHECK],[ -+ PILOT_LINK_HOOK($1,[],nofailure) -+]) -+ -+# AM_CONDITIONAL -*- Autoconf -*- -+ -+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 5 -+ -+AC_PREREQ(2.52) - - # AM_CONDITIONAL(NAME, SHELL-CONDITION) - # ------------------------------------- - # Define a conditional. - AC_DEFUN([AM_CONDITIONAL], --[AC_PREREQ(2.52)dnl -- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE])dnl --AC_SUBST([$1_FALSE])dnl --_AM_SUBST_NOTMAKE([$1_TRUE])dnl --_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE]) -+AC_SUBST([$1_FALSE]) - if $2; then - $1_TRUE= - $1_FALSE='#' -@@ -134,4828 +451,4070 @@ - fi - AC_CONFIG_COMMANDS_PRE( - [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([[conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]]) -+ AC_MSG_ERROR([conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]) - fi])]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 9 -+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL - --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If this macro is not defined by Autoconf, define it here. -+m4_ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [m4_define([AC_PROVIDE_IFELSE], -+ [m4_ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) - --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. --# --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl - --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], UPC, [depcc="$UPC" am_compiler_list=], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+# AC_PROG_LIBTOOL -+# --------------- -+AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -+ AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [AC_LIBTOOL_CXX], -+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -+ ])]) -+dnl And a similar setup for Fortran 77 support -+ AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [AC_LIBTOOL_F77], -+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -+])]) - --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -+ AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [ifdef([AC_PROG_GCJ], -+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([A][M_PROG_GCJ], -+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([LT_AC_PROG_GCJ], -+ [define([LT_AC_PROG_GCJ], -+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -+])])# AC_PROG_LIBTOOL - -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done -+# _AC_PROG_LIBTOOL -+# ---------------- -+AC_DEFUN([_AC_PROG_LIBTOOL], -+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -- cd .. -- rm -rf conftest.dir --else -- am_cv_$1_dependencies_compiler_type=none --fi --]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl - --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) -+# Prevent multiple expansion -+define([AC_PROG_LIBTOOL], []) -+])# _AC_PROG_LIBTOOL - - --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH])dnl --_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl --]) -+# AC_LIBTOOL_SETUP -+# ---------------- -+AC_DEFUN([AC_LIBTOOL_SETUP], -+[AC_PREREQ(2.50)dnl -+AC_REQUIRE([AC_ENABLE_SHARED])dnl -+AC_REQUIRE([AC_ENABLE_STATIC])dnl -+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_LD])dnl -+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -+AC_REQUIRE([AC_PROG_NM])dnl - --# Generate code to set up dependency tracking. -*- Autoconf -*- -+AC_REQUIRE([AC_PROG_LN_S])dnl -+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -+AC_REQUIRE([AC_OBJEXT])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+dnl - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+AC_LIBTOOL_SYS_MAX_CMD_LEN -+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+AC_LIBTOOL_OBJDIR - --#serial 3 -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+_LT_AC_PROG_ECHO_BACKSLASH - --# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # Grep'ing the whole file is not good either: AIX grep has a line -- # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES - fi -- # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -- test -z "$DEPDIR" && continue -- am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` -- # Find all dependency output files, they are included files with -- # $(DEPDIR) in their names. We invoke sed twice because it is the -- # simplest approach to changing $(DEPDIR) to its actual value in the -- # expansion. -- for file in `sed -n " -- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --])# _AM_OUTPUT_DEPENDENCY_COMMANDS -+ ;; -+esac - -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) --]) -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - --# serial 8 -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' - --# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. --AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -+# Constants: -+rm="rm -f" - --# Do all the work for Automake. -*- Autoconf -*- -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" - --# serial 12 -+AC_CHECK_TOOL(AR, ar, false) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) - --# This macro actually does too much. Some checks are only needed if --# your package does certain things. But this isn't really a big deal. -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" - --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.60])dnl --dnl Autoconf wants to disallow AM_ names. We explicitly allow --dnl the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl --AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl --AC_REQUIRE([AC_PROG_INSTALL])dnl --if test "`cd $srcdir && pwd`" != "`pwd`"; then -- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -- # is not polluted with repeated "-I." -- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -- # test to see if srcdir already configured -- if test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -- fi -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi - --# test whether we have cygpath --if test -z "$CYGPATH_W"; then -- if (cygpath --version) >/dev/null 2>/dev/null; then -- CYGPATH_W='cygpath -w' -- else -- CYGPATH_W=echo -+_LT_CC_BASENAME([$compiler]) -+ -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC - fi --fi --AC_SUBST([CYGPATH_W]) -+ ;; -+esac - --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl --dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. --m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+enable_win32_dll=yes, enable_win32_dll=no) - --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --AC_REQUIRE([AM_PROG_MKDIR_P])dnl --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_SET_LEADING_DOT])dnl --_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -- [_AM_PROG_TAR([v7])])]) --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_OBJC], -- [_AM_DEPENDENCIES(OBJC)], -- [define([AC_PROG_OBJC], -- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl --]) --]) -+AC_ARG_WITH([pic], -+ [AC_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+test -z "$pic_mode" && pic_mode=default - -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP - --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. The stamp files are numbered to have different names. - --# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the --# loop where config.status creates the headers, so we can generate --# our stamp files there. --AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], --[# Compute $1's index in $config_headers. --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in -- $1 | $1:* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac --done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --# Copyright (C) 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_AC_SYS_COMPILER - --# serial 2 - --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. --else -- am__leading_dot=_ --fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) - --# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. - --# serial 5 -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE - --# AM_PROG_LEX --# ----------- --# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a --# "missing" invocation, for better error output. --AC_DEFUN([AM_PROG_LEX], --[AC_PREREQ(2.50)dnl --AC_REQUIRE([AM_MISSING_HAS_RUN])dnl --AC_REQUIRE([AC_PROG_LEX])dnl --if test "$LEX" = :; then -- LEX=${am_missing_run}flex --fi]) - --# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- --# From Jim Meyering -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_LINKER_BOILERPLATE - --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. - --# serial 4 -+# _LT_AC_SYS_LIBPATH_AIX -+# ---------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_AC_SYS_LIBPATH_AIX - --AC_DEFUN([AM_MAINTAINER_MODE], --[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -- dnl maintainer-mode is disabled by default -- AC_ARG_ENABLE(maintainer-mode, --[ --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer], -- USE_MAINTAINER_MODE=$enableval, -- USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -- MAINT=$MAINTAINER_MODE_TRUE -- AC_SUBST(MAINT)dnl --] --) - --AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+# _LT_AC_SHELL_INIT(ARG) -+# ---------------------- -+AC_DEFUN([_LT_AC_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_AC_SHELL_INIT - --# Check to see how 'make' treats includes. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# _LT_AC_PROG_ECHO_BACKSLASH -+# -------------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -+[_LT_AC_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} - --# serial 3 -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac - --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --am__doit: -- @echo done --.PHONY: am__doit --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include="#" --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote="\"" -- _am_result=BSD -- fi -+echo=${ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} - fi --AC_SUBST([am__include]) --AC_SUBST([am__quote]) --AC_MSG_RESULT([$_am_result]) --rm -f confinc confmf --]) - --# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat </dev/null 2>&1 && unset CDPATH - --# serial 5 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -- -- --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --AC_REQUIRE_AUX_FILE([missing])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done - fi --]) -- --# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_MKDIR_P --# --------------- --# Check for `mkdir -p'. --AC_DEFUN([AM_PROG_MKDIR_P], --[AC_PREREQ([2.60])dnl --AC_REQUIRE([AC_PROG_MKDIR_P])dnl --dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, --dnl while keeping a definition of mkdir_p for backward compatibility. --dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. --dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of --dnl Makefile.ins that do not define MKDIR_P, so we do our own --dnl adjustment using top_builddir (which is defined more often than --dnl MKDIR_P). --AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl --case $mkdir_p in -- [[\\/$]]* | ?:[[\\/]]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac --]) -- --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# serial 3 -- --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -- --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_RUN_LOG(COMMAND) --# ------------------- --# Run COMMAND, save the exit status in ac_status, and log it. --# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) --AC_DEFUN([AM_RUN_LOG], --[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD -- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -- (exit $ac_status); }]) -- --# Check to make sure that the build environment is sane. -*- Autoconf -*- -- --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 --# Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. - --# serial 4 -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" - --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: - -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done - -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi -+ fi -+ fi -+ fi - fi --AC_MSG_RESULT(yes)]) -- --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_INSTALL_STRIP --# --------------------- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) - fi --INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# Copyright (C) 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi - --# _AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- --# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. --# This macro is traced by Automake. --AC_DEFUN([_AM_SUBST_NOTMAKE]) -+AC_SUBST(ECHO) -+])])# _LT_AC_PROG_ECHO_BACKSLASH - --# Check how to create a tarball. -*- Autoconf -*- - --# Copyright (C) 2004, 2005 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -+# _LT_AC_LOCK -+# ----------- -+AC_DEFUN([_LT_AC_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --# serial 2 -- --# _AM_PROG_TAR(FORMAT) --# -------------------- --# Check how to create a tarball in format FORMAT. --# FORMAT should be one of `v7', `ustar', or `pax'. --# --# Substitute a variable $(am__tar) that is a command --# writing to stdout a FORMAT-tarball containing the directory --# $tardir. --# tardir=directory && $(am__tar) > result.tar --# --# Substitute a variable $(am__untar) that extract such --# a tarball read from stdin. --# $(am__untar) < result.tar --AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. --AM_MISSING_PROG([AMTAR], [tar]) --m4_if([$1], [v7], -- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -- [m4_case([$1], [ustar],, [pax],, -- [m4_fatal([Unknown tar format])]) --AC_MSG_CHECKING([how to create a $1 tar archive]) --# Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' --_am_tools=${am_cv_prog_tar_$1-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- AM_RUN_LOG([$_am_tar --version]) && break -- done -- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x $1 -w "$$tardir"' -- am__tar_='pax -L -x $1 -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -- am__untar='cpio -i -H $1 -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac -- -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_$1}" && break -- -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -- rm -rf conftest.dir -- if test -s conftest.tar; then -- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac - fi --done --rm -rf conftest.dir -- --AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) --AC_MSG_RESULT([$am_cv_prog_tar_$1])]) --AC_SUBST([am__tar]) --AC_SUBST([am__untar]) --]) # _AM_PROG_TAR -- --dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) --dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS --dnl --AC_DEFUN([AM_PATH_ORBIT2], --[dnl --dnl Get the cflags and libraries from the orbit2-config script --dnl --AC_ARG_WITH(orbit-prefix,[ --with-orbit-prefix=PFX Prefix where ORBIT is installed (optional)], -- orbit_config_prefix="$withval", orbit_config_prefix="") --AC_ARG_WITH(orbit-exec-prefix,[ --with-orbit-exec-prefix=PFX Exec prefix where ORBIT is installed (optional)], -- orbit_config_exec_prefix="$withval", orbit_config_exec_prefix="") --AC_ARG_ENABLE(orbittest, [ --disable-orbittest Do not try to compile and run a test ORBIT program], -- , enable_orbittest=yes) -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; - -- for module in . $4 -- do -- case "$module" in -- server) -- orbit_config_args="$orbit_config_args server" -- ;; -- client) -- orbit_config_args="$orbit_config_args client" -- ;; -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; - esac -- done -- if test x$orbit_config_args = x ; then -- orbit_config_args=server -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac - fi -+ rm -rf conftest* -+ ;; - -- if test x$orbit_config_exec_prefix != x ; then -- orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix" -- if test x${ORBIT_CONFIG+set} != xset ; then -- ORBIT_CONFIG=$orbit_config_exec_prefix/bin/orbit2-config -- fi -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" - fi -- if test x$orbit_config_prefix != x ; then -- orbit_config_args="$orbit_config_args --prefix=$orbit_config_prefix" -- if test x${ORBIT_CONFIG+set} != xset ; then -- ORBIT_CONFIG=$orbit_config_prefix/bin/orbit2-config -- fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) LD="${LD-ld} -64" ;; -+ esac -+ ;; -+ esac - fi -+ rm -rf conftest* -+ ;; - -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no) -- min_orbit_version=ifelse([$1], , 2.3.0, $1) -- AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version) -- no_orbit="" -- if test "$ORBIT_CONFIG" = "no" ; then -- if test "$PKG_CONFIG" = "no" ; then -- no_orbit=yes -- else -- ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0` -- ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0` -- fi -- else -- ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags` -- ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs` -- fi -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+ ]) -+esac - -- if test "x$no_orbit" = x ; then -- ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0` -+need_locks="$enable_libtool_lock" - -- orbit_config_major_version=`echo $ORBIT_VERSION | \ -- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- orbit_config_minor_version=`echo $ORBIT_VERSION | \ -- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- orbit_config_micro_version=`echo $ORBIT_VERSION | \ -- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_orbittest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $ORBIT_CFLAGS" -- LIBS="$ORBIT_LIBS $LIBS" --dnl --dnl Now check if the installed ORBIT is sufficiently new. (Also sanity --dnl checks the results of orbit2-config to some extent --dnl -- rm -f conf.orbittest -- AC_TRY_RUN([ --#include --#include --#include -+])# _LT_AC_LOCK - --int --main () --{ -- int major, minor, micro; -- char *tmp_version; - -- system ("touch conf.orbittest"); -+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+]) - -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = g_strdup("$min_orbit_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_orbit_version"); -- exit(1); -- } -+if test x"[$]$2" = xyes; then -+ ifelse([$5], , :, [$5]) -+else -+ ifelse([$6], , :, [$6]) -+fi -+])# AC_LIBTOOL_COMPILER_OPTION - -- if ((orbit_major_version != $orbit_config_major_version) || -- (orbit_minor_version != $orbit_config_minor_version) || -- (orbit_micro_version != $orbit_config_micro_version)) -- { -- printf("\n*** 'pkg-config --version ORBit-2.0' returned %d.%d.%d, but ORBit (%d.%d.%d)\n", -- $orbit_config_major_version, $orbit_config_minor_version, $orbit_config_micro_version, -- orbit_major_version, orbit_minor_version, orbit_micro_version); -- printf ("*** was found! If orbit2-config was correct, then it is best\n"); -- printf ("*** to remove the old version of ORBit. You may also be able to fix the error\n"); -- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -- printf("*** required on your system.\n"); -- printf("*** If orbit2-config was wrong, set the environment variable ORBIT_CONFIG\n"); -- printf("*** to point to the correct copy of orbit2-config, and remove the file config.cache\n"); -- printf("*** before re-running configure\n"); -- } --#if defined (ORBIT_MAJOR_VERSION) && defined (ORBIT_MINOR_VERSION) && defined (ORBIT_MICRO_VERSION) -- else if ((orbit_major_version != ORBIT_MAJOR_VERSION) || -- (orbit_minor_version != ORBIT_MINOR_VERSION) || -- (orbit_micro_version != ORBIT_MICRO_VERSION)) -- { -- printf("*** ORBit header files (version %d.%d.%d) do not match\n", -- ORBIT_MAJOR_VERSION, ORBIT_MINOR_VERSION, ORBIT_MICRO_VERSION); -- printf("*** library (version %d.%d.%d)\n", -- orbit_major_version, orbit_minor_version, orbit_micro_version); -- } --#endif /* defined (ORBIT_MAJOR_VERSION) ... */ -- else -- { -- if ((orbit_major_version > major) || -- ((orbit_major_version == major) && (orbit_minor_version > minor)) || -- ((orbit_major_version == major) && (orbit_minor_version == minor) && (orbit_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** An old version of ORBit (%d.%d.%d) was found.\n", -- orbit_major_version, orbit_minor_version, orbit_micro_version); -- printf("*** You need a version of ORBit newer than %d.%d.%d. The latest version of\n", -- major, minor, micro); -- printf("*** ORBit is always available from ftp://ftp.orbit.org.\n"); -- printf("***\n"); -- printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the orbit2-config shell script is\n"); -- printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of ORBit, but you can also set the ORBIT_CONFIG environment to point to the\n"); -- printf("*** correct copy of orbit2-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -- printf("*** so that the correct libraries are found at run-time))\n"); -- } -- } -- return 1; --} --],, no_orbit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- if test "x$no_orbit" = x ; then -- AC_MSG_RESULT(yes) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$ORBIT_CONFIG" = "no" ; then -- echo "*** The orbit2-config script installed by ORBIT could not be found" -- echo "*** If ORBit was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the ORBIT_CONFIG environment variable to the" -- echo "*** full path to orbit2-config." -- else -- if test -f conf.orbittest ; then -- : -- else -- echo "*** Could not run ORBIT test program, checking why..." -- CFLAGS="$CFLAGS $ORBIT_CFLAGS" -- LIBS="$LIBS $ORBIT_LIBS" -- AC_TRY_LINK([ --#include --#include --], [ return ((orbit_major_version) || (orbit_minor_version) || (orbit_micro_version)); ], -- [ echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding ORBit or finding the wrong" -- echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -- echo "***" -- echo "*** If you have a RedHat 5.0 system, you should remove the ORBit package that" -- echo "*** came with the system with the command" -- echo "***" -- echo "*** rpm --erase --nodeps orbit orbit-devel" ], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means ORBIT was incorrectly installed" -- echo "*** or that you have moved ORBit since it was installed. In the latter case, you" -- echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG" ]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -+ -+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ------------------------------------------------------------ -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes - fi -+ else -+ $2=yes - fi -- ORBIT_CFLAGS="" -- ORBIT_LIBS="" -- ifelse([$3], , :, [$3]) -- fi -- -- AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, ifelse([$3], , :, [$3])) -- AC_SUBST(ORBIT_CFLAGS) -- AC_SUBST(ORBIT_LIBS) -- AC_SUBST(ORBIT_IDL) -- rm -f conf.orbittest -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" - ]) - --dnl AM_GCONF_SOURCE_2 --dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas --dnl (i.e. pass to gconftool-2 --dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where --dnl you should install foo.schemas files --dnl -- --AC_DEFUN([AM_GCONF_SOURCE_2], --[ -- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -- else -- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -- fi -+if test x"[$]$2" = xyes; then -+ ifelse([$4], , :, [$4]) -+else -+ ifelse([$5], , :, [$5]) -+fi -+])# AC_LIBTOOL_LINKER_OPTION - -- AC_ARG_WITH(gconf-source, -- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - -- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# -------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -+[# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" - -- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -- fi -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; - -- AC_ARG_WITH(gconf-schema-file-dir, -- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; - -- AC_SUBST(GCONF_SCHEMA_FILE_DIR) -- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - -- AC_ARG_ENABLE(schemas-install, -- [ --disable-schemas-install Disable the schemas installation], -- [case ${enableval} in -- yes|no) ;; -- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; -- esac]) -- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) --]) -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - --# Configure paths for GLIB --# Owen Taylor 1997-2001 -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; - --dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) --dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or --dnl gthread is specified in MODULES, pass to pkg-config --dnl --AC_DEFUN([AM_PATH_GLIB_2_0], --[dnl --dnl Get the cflags and libraries from pkg-config --dnl --AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], -- , enable_glibtest=yes) -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; - -- pkg_config_args=glib-2.0 -- for module in . $4 -- do -- case "$module" in -- gmodule) -- pkg_config_args="$pkg_config_args gmodule-2.0" -- ;; -- gmodule-no-export) -- pkg_config_args="$pkg_config_args gmodule-no-export-2.0" -- ;; -- gobject) -- pkg_config_args="$pkg_config_args gobject-2.0" -- ;; -- gthread) -- pkg_config_args="$pkg_config_args gthread-2.0" -- ;; -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac -- done -- -- PKG_PROG_PKG_CONFIG([0.16]) -- -- no_glib="" -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+])# AC_LIBTOOL_SYS_MAX_CMD_LEN - -- if test "x$PKG_CONFIG" = x ; then -- no_glib=yes -- PKG_CONFIG=no -- fi - -- min_glib_version=ifelse([$1], ,2.0.0,$1) -- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -+# _LT_AC_CHECK_DLFCN -+# ------------------ -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h)dnl -+])# _LT_AC_CHECK_DLFCN - -- if test x$PKG_CONFIG != xno ; then -- ## don't try to run the test against uninstalled libtool libs -- if $PKG_CONFIG --uninstalled $pkg_config_args; then -- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -- enable_glibtest=no -- fi - -- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -- : -- else -- no_glib=yes -- fi -- fi -+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# --------------------------------------------------------------------- -+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif - -- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_glibtest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" --dnl --dnl Now check if the installed GLIB is sufficiently new. (Also sanity --dnl checks the results of pkg-config to some extent) --dnl -- rm -f conf.glibtest -- AC_TRY_RUN([ --#include - #include --#include - --int --main () --{ -- int major, minor, micro; -- char *tmp_version; -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif - -- system ("touch conf.glibtest"); -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif - -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = g_strdup("$min_glib_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_glib_version"); -- exit(1); -- } -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif - -- if ((glib_major_version != $glib_config_major_version) || -- (glib_minor_version != $glib_config_minor_version) || -- (glib_micro_version != $glib_config_micro_version)) -- { -- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -- glib_major_version, glib_minor_version, glib_micro_version); -- printf ("*** was found! If pkg-config was correct, then it is best\n"); -- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -- printf("*** required on your system.\n"); -- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -- printf("*** to point to the correct configuration files\n"); -- } -- else if ((glib_major_version != GLIB_MAJOR_VERSION) || -- (glib_minor_version != GLIB_MINOR_VERSION) || -- (glib_micro_version != GLIB_MICRO_VERSION)) -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) - { -- printf("*** GLIB header files (version %d.%d.%d) do not match\n", -- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -- printf("*** library (version %d.%d.%d)\n", -- glib_major_version, glib_minor_version, glib_micro_version); -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ - } - else -- { -- if ((glib_major_version > major) || -- ((glib_major_version == major) && (glib_minor_version > minor)) || -- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -- glib_major_version, glib_minor_version, glib_micro_version); -- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -- major, minor, micro); -- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -- printf("***\n"); -- printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -- printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -- printf("*** so that the correct libraries are found at run-time))\n"); -- } -- } -- return 1; --} --],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -+ puts (dlerror ()); -+ -+ exit (status); -+}] -+EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 - fi -- if test "x$no_glib" = x ; then -- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$PKG_CONFIG" = "no" ; then -- echo "*** A new enough version of pkg-config was not found." -- echo "*** See http://www.freedesktop.org/software/pkgconfig/" -- else -- if test -f conf.glibtest ; then -- : -- else -- echo "*** Could not run GLIB test program, checking why..." -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$LIBS $GLIB_LIBS" -- AC_TRY_LINK([ --#include --#include --], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -- [ echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding GLIB or finding the wrong" -- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- GLIB_CFLAGS="" -- GLIB_LIBS="" -- GLIB_GENMARSHAL="" -- GOBJECT_QUERY="" -- GLIB_MKENUMS="" -- ifelse([$3], , :, [$3]) -- fi -- AC_SUBST(GLIB_CFLAGS) -- AC_SUBST(GLIB_LIBS) -- AC_SUBST(GLIB_GENMARSHAL) -- AC_SUBST(GOBJECT_QUERY) -- AC_SUBST(GLIB_MKENUMS) -- rm -f conf.glibtest --]) -- --# Copyright (C) 1995-2002 Free Software Foundation, Inc. --# Copyright (C) 2001-2003,2004 Red Hat, Inc. --# --# This file is free software, distributed under the terms of the GNU --# General Public License. As a special exception to the GNU General --# Public License, this file may be distributed as part of a program --# that contains a configuration script generated by Autoconf, under --# the same distribution terms as the rest of that program. --# --# This file can be copied and used freely without restrictions. It can --# be used in projects which are not available under the GNU Public License --# but which still want to provide support for the GNU gettext functionality. --# --# Macro to add for using GNU gettext. --# Ulrich Drepper , 1995, 1996 --# --# Modified to never use included libintl. --# Owen Taylor , 12/15/1998 --# --# Major rework to remove unused code --# Owen Taylor , 12/11/2002 --# --# Added better handling of ALL_LINGUAS from GNU gettext version --# written by Bruno Haible, Owen Taylor 5/30/3002 --# --# Modified to require ngettext --# Matthias Clasen 08/06/2004 --# --# We need this here as well, since someone might use autoconf-2.5x --# to configure GLib then an older version to configure a package --# using AM_GLIB_GNU_GETTEXT --AC_PREREQ(2.53) -- --dnl --dnl We go to great lengths to make sure that aclocal won't --dnl try to pull in the installed version of these macros --dnl when running aclocal in the glib directory. --dnl --m4_copy([AC_DEFUN],[glib_DEFUN]) --m4_copy([AC_REQUIRE],[glib_REQUIRE]) --dnl --dnl At the end, if we're not within glib, we'll define the public --dnl definitions in terms of our private definitions. --dnl -+fi -+rm -fr conftest* -+])# _LT_AC_TRY_DLOPEN_SELF - --# GLIB_LC_MESSAGES --#-------------------- --glib_DEFUN([GLIB_LC_MESSAGES], -- [AC_CHECK_HEADERS([locale.h]) -- if test $ac_cv_header_locale_h = yes; then -- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -- [AC_TRY_LINK([#include ], [return LC_MESSAGES], -- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -- if test $am_cv_val_LC_MESSAGES = yes; then -- AC_DEFINE(HAVE_LC_MESSAGES, 1, -- [Define if your file defines LC_MESSAGES.]) -- fi -- fi]) - --# GLIB_PATH_PROG_WITH_TEST --#---------------------------- --dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -- AC_MSG_RESULT([$]$1) -+# AC_LIBTOOL_DLOPEN_SELF -+# ---------------------- -+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown - else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl --]) -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= - --# GLIB_WITH_NLS --#----------------- --glib_DEFUN([GLIB_WITH_NLS], -- dnl NLS is obligatory -- [AC_REQUIRE([AC_CANONICAL_HOST])dnl -- USE_NLS=yes -- AC_SUBST(USE_NLS) -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; - -- gt_cv_have_gettext=no -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; - -- CATOBJEXT=NONE -- XGETTEXT=: -- INTLLIBS= -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; - -- AC_CHECK_HEADER(libintl.h, -- [gt_cv_func_dgettext_libintl="no" -- libintl_extra_libs="" -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; - -- # -- # First check in libc -- # -- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -- [AC_TRY_LINK([ --#include --], -- [return !ngettext ("","", 1)], -- gt_cv_func_ngettext_libc=yes, -- gt_cv_func_ngettext_libc=no) -- ]) -- -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -- [AC_TRY_LINK([ --#include --], -- [return !dgettext ("","")], -- gt_cv_func_dgettext_libc=yes, -- gt_cv_func_dgettext_libc=no) -- ]) -- fi -- -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- AC_CHECK_FUNCS(bind_textdomain_codeset) -- fi -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac - -- # -- # If we don't have everything we want, check in libintl -- # -- if test "$gt_cv_func_dgettext_libc" != "yes" \ -- || test "$gt_cv_func_ngettext_libc" != "yes" \ -- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -- -- AC_CHECK_LIB(intl, bindtextdomain, -- [AC_CHECK_LIB(intl, ngettext, -- [AC_CHECK_LIB(intl, dgettext, -- gt_cv_func_dgettext_libintl=yes)])]) -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi - -- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- AC_MSG_CHECKING([if -liconv is needed to use gettext]) -- AC_MSG_RESULT([]) -- AC_CHECK_LIB(intl, ngettext, -- [AC_CHECK_LIB(intl, dcgettext, -- [gt_cv_func_dgettext_libintl=yes -- libintl_extra_libs=-liconv], -- :,-liconv)], -- :,-liconv) -- fi -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - -- # -- # If we found libintl, then check in it for bind_textdomain_codeset(); -- # we'll prefer libc if neither have bind_textdomain_codeset(), -- # and both have dgettext and ngettext -- # -- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $libintl_extra_libs" -- unset ac_cv_func_bind_textdomain_codeset -- AC_CHECK_FUNCS(bind_textdomain_codeset) -- LIBS="$glib_save_LIBS" -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -- gt_cv_func_dgettext_libc=no -- else -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- && test "$gt_cv_func_ngettext_libc" = "yes"; then -- gt_cv_func_dgettext_libintl=no -- fi -- fi -- fi -- fi -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" - -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- || test "$gt_cv_func_dgettext_libintl" = "yes"; then -- gt_cv_have_gettext=yes -- fi -- -- if test "$gt_cv_func_dgettext_libintl" = "yes"; then -- INTLLIBS="-lintl $libintl_extra_libs" -- fi -- -- if test "$gt_cv_have_gettext" = "yes"; then -- AC_DEFINE(HAVE_GETTEXT,1, -- [Define if the GNU gettext() function is already present or preinstalled.]) -- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -- if test "$MSGFMT" != "no"; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS $INTLLIBS" -- AC_CHECK_FUNCS(dcgettext) -- MSGFMT_OPTS= -- AC_MSG_CHECKING([if msgfmt accepts -c]) -- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ --msgid "" --msgstr "" --"Content-Type: text/plain; charset=UTF-8\n" --"Project-Id-Version: test 1.0\n" --"PO-Revision-Date: 2007-02-15 12:01+0100\n" --"Last-Translator: test \n" --"Language-Team: C \n" --"MIME-Version: 1.0\n" --"Content-Transfer-Encoding: 8bit\n" --], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) -- AC_SUBST(MSGFMT_OPTS) -- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr], -- [CATOBJEXT=.gmo -- DATADIRNAME=share], -- [case $host in -- *-*-solaris*) -- dnl On Solaris, if bind_textdomain_codeset is in libc, -- dnl GNU format message catalog is always supported, -- dnl since both are added to the libc all together. -- dnl Hence, we'd like to go with DATADIRNAME=share and -- dnl and CATOBJEXT=.gmo in this case. -- AC_CHECK_FUNC(bind_textdomain_codeset, -- [CATOBJEXT=.gmo -- DATADIRNAME=share], -- [CATOBJEXT=.mo -- DATADIRNAME=lib]) -- ;; -- *) -- CATOBJEXT=.mo -- DATADIRNAME=lib -- ;; -- esac]) -- LIBS="$glib_save_LIBS" -- INSTOBJEXT=.mo -- else -- gt_cv_have_gettext=no -- fi -- fi -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - -- if test "$gt_cv_have_gettext" = "yes" ; then -- AC_DEFINE(ENABLE_NLS, 1, -- [always defined to indicate that i18n is enabled]) -- fi -- -- dnl Test whether we really found GNU xgettext. -- if test "$XGETTEXT" != ":"; then -- dnl If it is not GNU xgettext we define it as : so that the -- dnl Makefiles still can work. -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- AC_MSG_RESULT( -- [found xgettext program is not GNU xgettext; ignore it]) -- XGETTEXT=":" -- fi -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) - fi - -- # We need to process the po/ directory. -- POSUB=po -- -- AC_OUTPUT_COMMANDS( -- [case "$CONFIG_FILES" in *po/Makefile.in*) -- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -- esac]) -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac - -- dnl These rules are solely for the distribution goal. While doing this -- dnl we only have to keep exactly one list of the available catalogs -- dnl in configure.in. -- for lang in $ALL_LINGUAS; do -- GMOFILES="$GMOFILES $lang.gmo" -- POFILES="$POFILES $lang.po" -- done -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac - -- dnl Make all variables we use known to autoconf. -- AC_SUBST(CATALOGS) -- AC_SUBST(CATOBJEXT) -- AC_SUBST(DATADIRNAME) -- AC_SUBST(GMOFILES) -- AC_SUBST(INSTOBJEXT) -- AC_SUBST(INTLLIBS) -- AC_SUBST(PO_IN_DATADIR_TRUE) -- AC_SUBST(PO_IN_DATADIR_FALSE) -- AC_SUBST(POFILES) -- AC_SUBST(POSUB) -- ]) -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+])# AC_LIBTOOL_DLOPEN_SELF - --# AM_GLIB_GNU_GETTEXT --# ------------------- --# Do checks necessary for use of gettext. If a suitable implementation --# of gettext is found in either in libintl or in the C library, --# it will set INTLLIBS to the libraries needed for use of gettext --# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable --# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() --# on various variables needed by the Makefile.in.in installed by --# glib-gettextize. --dnl --glib_DEFUN([GLIB_GNU_GETTEXT], -- [AC_REQUIRE([AC_PROG_CC])dnl -- AC_REQUIRE([AC_HEADER_STDC])dnl -- -- GLIB_LC_MESSAGES -- GLIB_WITH_NLS - -- if test "$gt_cv_have_gettext" = "yes"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- AC_MSG_CHECKING(for catalogs to be installed) -- NEW_LINGUAS= -- for presentlang in $ALL_LINGUAS; do -- useit=no -- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -- desiredlanguages="$LINGUAS" -- else -- desiredlanguages="$ALL_LINGUAS" -- fi -- for desiredlang in $desiredlanguages; do -- # Use the presentlang catalog if desiredlang is -- # a. equal to presentlang, or -- # b. a variant of presentlang (because in this case, -- # presentlang can be used as a fallback for messages -- # which are not translated in the desiredlang catalog). -- case "$desiredlang" in -- "$presentlang"*) useit=yes;; -- esac -- done -- if test $useit = yes; then -- NEW_LINGUAS="$NEW_LINGUAS $presentlang" -- fi -- done -- LINGUAS=$NEW_LINGUAS -- AC_MSG_RESULT($LINGUAS) -- fi -+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -+# --------------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler -+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- dnl Construct list of names of catalog files to be constructed. -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+]) -+])# AC_LIBTOOL_PROG_CC_C_O - -- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -- dnl Try to locate is. -- MKINSTALLDIRS= -- if test -n "$ac_aux_dir"; then -- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -- fi -- if test -z "$MKINSTALLDIRS"; then -- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -- fi -- AC_SUBST(MKINSTALLDIRS) - -- dnl Generate list of files to be processed by xgettext which will -- dnl be included in po/Makefile. -- test -d po || mkdir po -- if test "x$srcdir" != "x."; then -- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -- posrcprefix="$srcdir/" -- else -- posrcprefix="../$srcdir/" -- fi -- else -- posrcprefix="../" -- fi -- rm -f po/POTFILES -- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -- < $srcdir/po/POTFILES.in > po/POTFILES -- ]) -+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -+# ----------------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -+[AC_REQUIRE([_LT_AC_LOCK])dnl - --# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) --# ------------------------------- --# Define VARIABLE to the location where catalog files will --# be installed by po/Makefile. --glib_DEFUN([GLIB_DEFINE_LOCALEDIR], --[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl --glib_save_prefix="$prefix" --glib_save_exec_prefix="$exec_prefix" --glib_save_datarootdir="$datarootdir" --test "x$prefix" = xNONE && prefix=$ac_default_prefix --test "x$exec_prefix" = xNONE && exec_prefix=$prefix --datarootdir=`eval echo "${datarootdir}"` --if test "x$CATOBJEXT" = "x.mo" ; then -- localedir=`eval echo "${libdir}/locale"` -+hard_links="nottested" -+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi - else -- localedir=`eval echo "${datadir}/locale"` -+ need_locks=no - fi --prefix="$glib_save_prefix" --exec_prefix="$glib_save_exec_prefix" --datarootdir="$glib_save_datarootdir" --AC_DEFINE_UNQUOTED($1, "$localedir", -- [Define the location where the catalogs will be installed]) --]) -- --dnl --dnl Now the definitions that aclocal will find --dnl --ifdef(glib_configure_in,[],[ --AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) --AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) --])dnl -- --# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) --# --# Create a temporary file with TEST-FILE as its contents and pass the --# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with --# 0 and perform ACTION-IF-FAIL for any other exit status. --AC_DEFUN([GLIB_RUN_PROG], --[cat >conftest.foo <<_ACEOF --$2 --_ACEOF --if AC_RUN_LOG([$1 conftest.foo]); then -- m4_ifval([$3], [$3], [:]) --m4_ifvaln([$4], [else $4])dnl --echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD --sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD --fi]) -- -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - --dnl GNOME_COMPILE_WARNINGS --dnl Turn on many useful compiler warnings --dnl For now, only works on GCC --AC_DEFUN([GNOME_COMPILE_WARNINGS],[ -- dnl ****************************** -- dnl More compiler warnings -- dnl ****************************** -- -- AC_ARG_ENABLE(compile-warnings, -- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], -- [Turn on compiler warnings]),, -- [enable_compile_warnings="m4_default([$1],[yes])"]) -- -- warnCFLAGS= -- if test "x$GCC" != xyes; then -- enable_compile_warnings=no -- fi -- -- warning_flags= -- realsave_CFLAGS="$CFLAGS" -- -- case "$enable_compile_warnings" in -- no) -- warning_flags= -- ;; -- minimum) -- warning_flags="-Wall" -- ;; -- yes) -- warning_flags="-Wall -Wmissing-prototypes" -- ;; -- maximum|error) -- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" -- CFLAGS="$warning_flags $CFLAGS" -- for option in -Wno-sign-compare; do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- AC_MSG_CHECKING([whether gcc understands $option]) -- AC_TRY_COMPILE([], [], -- has_option=yes, -- has_option=no,) -- CFLAGS="$SAVE_CFLAGS" -- AC_MSG_RESULT($has_option) -- if test $has_option = yes; then -- warning_flags="$warning_flags $option" -- fi -- unset has_option -- unset SAVE_CFLAGS -- done -- unset option -- if test "$enable_compile_warnings" = "error" ; then -- warning_flags="$warning_flags -Werror" -- fi -- ;; -- *) -- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) -- ;; -- esac -- CFLAGS="$realsave_CFLAGS" -- AC_MSG_CHECKING(what warning flags to pass to the C compiler) -- AC_MSG_RESULT($warning_flags) -- -- AC_ARG_ENABLE(iso-c, -- AC_HELP_STRING([--enable-iso-c], -- [Try to warn if code is not ISO C ]),, -- [enable_iso_c=no]) -- -- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) -- complCFLAGS= -- if test "x$enable_iso_c" != "xno"; then -- if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *[\ \ ]-ansi[\ \ ]*) ;; -- *) complCFLAGS="$complCFLAGS -ansi" ;; -- esac -- case " $CFLAGS " in -- *[\ \ ]-pedantic[\ \ ]*) ;; -- *) complCFLAGS="$complCFLAGS -pedantic" ;; -- esac -- fi -- fi -- AC_MSG_RESULT($complCFLAGS) - -- WARN_CFLAGS="$warning_flags $complCFLAGS" -- AC_SUBST(WARN_CFLAGS) --]) -+# AC_LIBTOOL_OBJDIR -+# ----------------- -+AC_DEFUN([AC_LIBTOOL_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR - --dnl For C++, do basically the same thing. - --AC_DEFUN([GNOME_CXX_WARNINGS],[ -- AC_ARG_ENABLE(cxx-warnings, -- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] -- [Turn on compiler warnings.]),, -- [enable_cxx_warnings="m4_default([$1],[minimum])"]) -- -- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) -- warnCXXFLAGS= -- if test "x$GXX" != xyes; then -- enable_cxx_warnings=no -- fi -- if test "x$enable_cxx_warnings" != "xno"; then -- if test "x$GXX" = "xyes"; then -- case " $CXXFLAGS " in -- *[\ \ ]-Wall[\ \ ]*) ;; -- *) warnCXXFLAGS="-Wall -Wno-unused" ;; -- esac -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- -+# Check hardcoding attributes. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_AC_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - -- ## -W is not all that useful. And it cannot be controlled -- ## with individual -Wno-xxx flags, unlike -Wall -- if test "x$enable_cxx_warnings" = "xyes"; then -- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" -- fi -- fi -+ # We can hardcode non-existant directories. -+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -- AC_MSG_RESULT($warnCXXFLAGS) -- -- AC_ARG_ENABLE(iso-cxx, -- AC_HELP_STRING([--enable-iso-cxx], -- [Try to warn if code is not ISO C++ ]),, -- [enable_iso_cxx=no]) -- -- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) -- complCXXFLAGS= -- if test "x$enable_iso_cxx" != "xno"; then -- if test "x$GXX" = "xyes"; then -- case " $CXXFLAGS " in -- *[\ \ ]-ansi[\ \ ]*) ;; -- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; -- esac -- -- case " $CXXFLAGS " in -- *[\ \ ]-pedantic[\ \ ]*) ;; -- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; -- esac -- fi -- fi -- AC_MSG_RESULT($complCXXFLAGS) -- -- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" -- AC_SUBST(WARN_CXXFLAGS) --]) -- --dnl Do not call GNOME_DOC_DEFINES directly. It is split out from --dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. --AC_DEFUN([GNOME_DOC_DEFINES], --[ --AC_ARG_WITH([help-dir], -- AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, -- [with_help_dir='${datadir}/gnome/help']) --HELP_DIR="$with_help_dir" --AC_SUBST(HELP_DIR) -- --AC_ARG_WITH([omf-dir], -- AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, -- [with_omf_dir='${datadir}/omf']) --OMF_DIR="$with_omf_dir" --AC_SUBST(OMF_DIR) -- --AC_ARG_WITH([help-formats], -- AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, -- [with_help_formats='']) --DOC_USER_FORMATS="$with_help_formats" --AC_SUBST(DOC_USER_FORMATS) -- --AC_ARG_ENABLE([scrollkeeper], -- [AC_HELP_STRING([--disable-scrollkeeper], -- [do not make updates to the scrollkeeper database])],, -- enable_scrollkeeper=yes) --AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) -- --AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) --]) -- --# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) --# --AC_DEFUN([GNOME_DOC_INIT], --[ --ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) -- --PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], -- [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) -- --if test "$gdu_cv_have_gdu" = "yes"; then -- ifelse([$2],,[:],[$2]) - else -- ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported - fi -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - --GNOME_DOC_DEFINES --]) -- -+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - --dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) --# serial 36 IT_PROG_INTLTOOL --AC_DEFUN([IT_PROG_INTLTOOL], --[AC_PREREQ([2.50])dnl - --case "$am__api_version" in -- 1.[01234]) -- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) -- ;; -- *) -+# AC_LIBTOOL_SYS_LIB_STRIP -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -+[striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) - ;; --esac -- --if test -n "$1"; then -- AC_MSG_CHECKING([for intltool >= $1]) -- -- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` -- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` -- ] -- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -+ esac - fi -+])# AC_LIBTOOL_SYS_LIB_STRIP - -- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' --INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' -- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' --INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' -- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -- --AC_SUBST(INTLTOOL_DESKTOP_RULE) --AC_SUBST(INTLTOOL_DIRECTORY_RULE) --AC_SUBST(INTLTOOL_KEYS_RULE) --AC_SUBST(INTLTOOL_PROP_RULE) --AC_SUBST(INTLTOOL_OAF_RULE) --AC_SUBST(INTLTOOL_PONG_RULE) --AC_SUBST(INTLTOOL_SERVER_RULE) --AC_SUBST(INTLTOOL_SHEET_RULE) --AC_SUBST(INTLTOOL_SOUNDLIST_RULE) --AC_SUBST(INTLTOOL_UI_RULE) --AC_SUBST(INTLTOOL_XAM_RULE) --AC_SUBST(INTLTOOL_KBD_RULE) --AC_SUBST(INTLTOOL_XML_RULE) --AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) --AC_SUBST(INTLTOOL_CAVES_RULE) --AC_SUBST(INTLTOOL_SCHEMAS_RULE) --AC_SUBST(INTLTOOL_THEME_RULE) --AC_SUBST(INTLTOOL_SERVICE_RULE) --AC_SUBST(INTLTOOL_POLICY_RULE) -- --# Check the gettext tools to make sure they are GNU --AC_PATH_PROG(XGETTEXT, xgettext) --AC_PATH_PROG(MSGMERGE, msgmerge) --AC_PATH_PROG(MSGFMT, msgfmt) --if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -- AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) --fi --xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" --mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" --mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" --if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -- AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) --fi -- --# Use the tools built into the package, not the ones that are installed. --AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') --AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') --AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') -- --AC_PATH_PROG(INTLTOOL_PERL, perl) --if test -z "$INTLTOOL_PERL"; then -- AC_MSG_ERROR([perl not found; required for intltool]) --fi --if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then -- AC_MSG_ERROR([perl 5.x required for intltool]) --fi --if test "x$2" != "xno-xml"; then -- AC_MSG_CHECKING([for XML::Parser]) -- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -- AC_MSG_RESULT([ok]) -- else -- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -- fi --fi -- --# Substitute ALL_LINGUAS so we can use it in po/Makefile --AC_SUBST(ALL_LINGUAS) - --# Set DATADIRNAME correctly if it is not set yet --# (copied from glib-gettext.m4) --if test -z "$DATADIRNAME"; then -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[]], -- [[extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr]])], -- [DATADIRNAME=share], -- [case $host in -- *-*-solaris*) -- dnl On Solaris, if bind_textdomain_codeset is in libc, -- dnl GNU format message catalog is always supported, -- dnl since both are added to the libc all together. -- dnl Hence, we'd like to go with DATADIRNAME=share -- dnl in this case. -- AC_CHECK_FUNC(bind_textdomain_codeset, -- [DATADIRNAME=share], [DATADIRNAME=lib]) -- ;; -- *) -- [DATADIRNAME=lib] -- ;; -- esac]) --fi --AC_SUBST(DATADIRNAME) -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+m4_if($1,[],[ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi]) -+need_lib_prefix=unknown -+hardcode_into_libs=no - --IT_PO_SUBDIR([po]) -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown - --dnl The following is very similar to --dnl --dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) --dnl --dnl with the following slight differences: --dnl - the *.in files are in ac_aux_dir, --dnl - if the file haven't changed upon reconfigure, it's not touched, --dnl - the evaluation of the third parameter enables a hack which computes --dnl the actual value of $libdir, --dnl - the user sees "executing intltool commands", instead of --dnl "creating intltool-extract" and such. --dnl --dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were --dnl a reason for it. -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH - --AC_CONFIG_COMMANDS([intltool], [ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; - --for file in intltool-extract intltool-merge intltool-update; do -- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ -- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ -- < ${ac_aux_dir}/${file}.in > ${file}.out -- if cmp -s ${file} ${file}.out 2>/dev/null; then -- rm -f ${file}.out -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH - else -- mv -f ${file}.out ${file} -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH - fi -- chmod ugo+x ${file} -- chmod u+w ${file} --done -+ ;; - --], --[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' --prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" --INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - --]) -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - --# IT_PO_SUBDIR(DIRNAME) --# --------------------- --# All po subdirs have to be declared with this macro; the subdir "po" is --# declared by IT_PROG_INTLTOOL. --# --AC_DEFUN([IT_PO_SUBDIR], --[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. --dnl --dnl The following CONFIG_COMMANDS should be exetuted at the very end --dnl of config.status. --AC_CONFIG_COMMANDS_PRE([ -- AC_CONFIG_COMMANDS([$1/stamp-it], [ -- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" -- >"$1/stamp-it.tmp" -- [sed '/^#/d -- s/^[[].*] *// -- /^[ ]*$/d -- '"s|^| $ac_top_srcdir/|" \ -- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" -- ] -- if test ! -f "$1/Makefile"; then -- AC_MSG_ERROR([$1/Makefile is not ready.]) -- fi -- mv "$1/Makefile" "$1/Makefile.tmp" -- [sed '/^POTFILES =/,/[^\\]$/ { -- /^POTFILES =/!d -- r $1/POTFILES -- } -- ' "$1/Makefile.tmp" >"$1/Makefile"] -- rm -f "$1/Makefile.tmp" -- mv "$1/stamp-it.tmp" "$1/stamp-it" -- ]) --])dnl --]) -- -- --# deprecated macros --AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) --# A hint is needed for aclocal from Automake <= 1.9.4: --# AC_DEFUN([AC_PROG_INTLTOOL], ...) -- -- --# isc-posix.m4 serial 2 (gettext-0.11.2) --dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -- --# This test replaces the one in autoconf. --# Currently this macro should have the same name as the autoconf macro --# because gettext's gettext.m4 (distributed in the automake package) --# still uses it. Otherwise, the use in gettext.m4 makes autoheader --# give these diagnostics: --# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX --# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -- --undefine([AC_ISC_POSIX]) -- --AC_DEFUN([AC_ISC_POSIX], -- [ -- dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -- ] --) -- --# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -- --# serial 48 AC_PROG_LIBTOOL -- -- --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If this macro is not defined by Autoconf, define it here. --m4_ifdef([AC_PROVIDE_IFELSE], -- [], -- [m4_define([AC_PROVIDE_IFELSE], -- [m4_ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -- -- --# AC_PROG_LIBTOOL --# --------------- --AC_DEFUN([AC_PROG_LIBTOOL], --[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl --dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX --dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -- AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [AC_LIBTOOL_CXX], -- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -- ])]) --dnl And a similar setup for Fortran 77 support -- AC_PROVIDE_IFELSE([AC_PROG_F77], -- [AC_LIBTOOL_F77], -- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 --])]) -- --dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. --dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run --dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -- AC_PROVIDE_IFELSE([AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [ifdef([AC_PROG_GCJ], -- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([A][M_PROG_GCJ], -- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([LT_AC_PROG_GCJ], -- [define([LT_AC_PROG_GCJ], -- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) --])])# AC_PROG_LIBTOOL -- -- --# _AC_PROG_LIBTOOL --# ---------------- --AC_DEFUN([_AC_PROG_LIBTOOL], --[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl --AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl --AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl --AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -- --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -- --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' --AC_SUBST(LIBTOOL)dnl -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - --# Prevent multiple expansion --define([AC_PROG_LIBTOOL], []) --])# _AC_PROG_LIBTOOL -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes - -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; - --# AC_LIBTOOL_SETUP --# ---------------- --AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.50)dnl --AC_REQUIRE([AC_ENABLE_SHARED])dnl --AC_REQUIRE([AC_ENABLE_STATIC])dnl --AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_PROG_LD])dnl --AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl --AC_REQUIRE([AC_PROG_NM])dnl -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; - --AC_REQUIRE([AC_PROG_LN_S])dnl --AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl --# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! --AC_REQUIRE([AC_OBJEXT])dnl --AC_REQUIRE([AC_EXEEXT])dnl --dnl -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; - --AC_LIBTOOL_SYS_MAX_CMD_LEN --AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --AC_LIBTOOL_OBJDIR -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; - --AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl --_LT_AC_PROG_ECHO_BACKSLASH -+freebsd1*) -+ dynamic_linker=no -+ ;; - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac - fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac - ;; --esac -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' --[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - --# Same as above, but do not quote variable references. --[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; - --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- --# Constants: --rm="rm -f" -- --# Global variables: --default_ofile=libtool --can_build_shared=yes -- --# All known linkers require a `.a' archive for static linking (except MSVC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" -- --AC_CHECK_TOOL(AR, ar, false) --AC_CHECK_TOOL(RANLIB, ranlib, :) --AC_CHECK_TOOL(STRIP, strip, :) -- --old_CC="$CC" --old_CFLAGS="$CFLAGS" -- --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$LTCC" && LTCC=$CC --test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$SED" && SED=sed --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+interix[[3-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; - --if test -n "$RANLIB"; then -+irix5* | irix6* | nonstopux*) - case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= - ;; - *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac - ;; - esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi -- --_LT_CC_BASENAME([$compiler]) -- --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- AC_PATH_MAGIC -- fi -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes - ;; --esac -- --AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -- --AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --AC_ARG_WITH([pic], -- [AC_HELP_STRING([--with-pic], -- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [pic_mode="$withval"], -- [pic_mode=default]) --test -z "$pic_mode" && pic_mode=default -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - --# Use C for the default configuration in the libtool script --tagname= --AC_LIBTOOL_LANG_C_CONFIG --_LT_AC_TAGCONFIG --])# AC_LIBTOOL_SETUP -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi - --# _LT_AC_SYS_COMPILER --# ------------------- --AC_DEFUN([_LT_AC_SYS_COMPILER], --[AC_REQUIRE([AC_PROG_CC])dnl -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - --# Allow CC to be a program name with arguments. --compiler=$CC --])# _LT_AC_SYS_COMPILER -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - --# _LT_CC_BASENAME(CC) --# ------------------- --# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. --AC_DEFUN([_LT_CC_BASENAME], --[for cc_temp in $1""; do -- case $cc_temp in -- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -- \-*) ;; -- *) break;; -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; - esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` --]) -- -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; - --# _LT_COMPILER_BOILERPLATE --# ------------------------ --# Check for compiler boilerplate output or warnings with --# the simple compiler test code. --AC_DEFUN([_LT_COMPILER_BOILERPLATE], --[ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext --eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err --_lt_compiler_boilerplate=`cat conftest.err` --$rm conftest* --])# _LT_COMPILER_BOILERPLATE -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; - --# _LT_LINKER_BOILERPLATE --# ---------------------- --# Check for linker boilerplate output or warnings with --# the simple link test code. --AC_DEFUN([_LT_LINKER_BOILERPLATE], --[ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext --eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err --_lt_linker_boilerplate=`cat conftest.err` --$rm conftest* --])# _LT_LINKER_BOILERPLATE -+rdos*) -+ dynamic_linker=no -+ ;; - -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; - --# _LT_AC_SYS_LIBPATH_AIX --# ---------------------- --# Links a minimal program and checks the executable --# for the system default hardcoded library path. In most cases, --# this is /usr/lib:/lib, but when the MPI compilers are used --# the location of the communication and MPI libs are included too. --# If we don't find anything, use the default library path according --# to the aix ld manual. --AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], --[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi --])# _LT_AC_SYS_LIBPATH_AIX -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; - -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; - --# _LT_AC_SHELL_INIT(ARG) --# ---------------------- --AC_DEFUN([_LT_AC_SHELL_INIT], --[ifdef([AC_DIVERSION_NOTICE], -- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --$1 --AC_DIVERT_POP --])# _LT_AC_SHELL_INIT -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; - -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; - --# _LT_AC_PROG_ECHO_BACKSLASH --# -------------------------- --# Add some code to the start of the generated configure script which --# will find an echo command which doesn't interpret backslashes. --AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], --[_LT_AC_SHELL_INIT([ --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; - --case X$ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+*) -+ dynamic_linker=no - ;; - esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no - --echo=${ECHO-echo} --if test "X[$]1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X[$]1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi -+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - --if test "X[$]1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat </dev/null 2>&1 && unset CDPATH -+# _LT_AC_TAGCONFIG -+# ---------------- -+AC_DEFUN([_LT_AC_TAGCONFIG], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_ARG_WITH([tags], -+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -+ [include additional configurations @<:@automatic@:>@])], -+ [tagnames="$withval"]) - --if test -z "$ECHO"; then --if test "X${echo_test_string+set}" != Xset; then --# find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string=`eval $cmd`) 2>/dev/null && -- echo_test_string=`eval $cmd` && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -- then -- break -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ AC_MSG_WARN([output file `$ofile' does not exist]) -+ fi -+ -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -+ else -+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi -- done --fi -+ fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi - --if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : --else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do - IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$dir/echo" -- break -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -+ "") ;; -+ *) AC_MSG_ERROR([invalid tag name: $tagname]) -+ ;; -+ esac -+ -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi -- done -- IFS="$lt_save_ifs" - -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile - -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_LIBTOOL_LANG_CXX_CONFIG -+ else -+ tagname="" -+ fi -+ ;; - -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ AC_LIBTOOL_LANG_F77_CONFIG - else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -+ tagname="" - fi -- fi -+ ;; -+ -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ AC_LIBTOOL_LANG_GCJ_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ RC) -+ AC_LIBTOOL_LANG_RC_CONFIG -+ ;; -+ -+ *) -+ AC_MSG_ERROR([Unsupported tag name: $tagname]) -+ ;; -+ esac -+ -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" - fi -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi - fi --fi -+])# _LT_AC_TAGCONFIG - --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --ECHO=$echo --if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" --fi - --AC_SUBST(ECHO) --])])# _LT_AC_PROG_ECHO_BACKSLASH -+# AC_LIBTOOL_DLOPEN -+# ----------------- -+# enable checks for dlopen support -+AC_DEFUN([AC_LIBTOOL_DLOPEN], -+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_DLOPEN - - --# _LT_AC_LOCK --# ----------- --AC_DEFUN([_LT_AC_LOCK], --[AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# AC_LIBTOOL_WIN32_DLL -+# -------------------- -+# declare package support for building win32 DLLs -+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_WIN32_DLL - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --ia64-*-hpux*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.$ac_objext` in -- *ELF-32*) -- HPUX_IA64_MODE="32" -- ;; -- *ELF-64*) -- HPUX_IA64_MODE="64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; --*-*-irix6*) -- # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- if test "$lt_cv_prog_gnu_ld" = yes; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -melf32bsmip" -- ;; -- *N32*) -- LD="${LD-ld} -melf32bmipn32" -- ;; -- *64-bit*) -- LD="${LD-ld} -melf64bmip" -- ;; -- esac -- else -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- fi -- rm -rf conftest* -- ;; - --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.o` in -- *32-bit*) -- case $host in -- x86_64-*linux*) -- LD="${LD-ld} -m elf_i386" -- ;; -- ppc64-*linux*|powerpc64-*linux*) -- LD="${LD-ld} -m elf32ppclinux" -- ;; -- s390x-*linux*) -- LD="${LD-ld} -m elf_s390" -- ;; -- sparc64-*linux*) -- LD="${LD-ld} -m elf32_sparc" -- ;; -- esac -+# AC_ENABLE_SHARED([DEFAULT]) -+# --------------------------- -+# implement the --enable-shared flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_SHARED], -+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([shared], -+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" - ;; -- *64-bit*) -- case $host in -- x86_64-*linux*) -- LD="${LD-ld} -m elf_x86_64" -- ;; -- ppc*-*linux*|powerpc*-*linux*) -- LD="${LD-ld} -m elf64ppc" -- ;; -- s390*-*linux*) -- LD="${LD-ld} -m elf64_s390" -- ;; -- sparc*-*linux*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -+ esac], -+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -+])# AC_ENABLE_SHARED - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -- [AC_LANG_PUSH(C) -- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -- AC_LANG_POP]) -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; --sparc*-*solaris*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.o` in -- *64-bit*) -- case $lt_cv_prog_gnu_ld in -- yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; - --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -- AC_CHECK_TOOL(DLLTOOL, dlltool, false) -- AC_CHECK_TOOL(AS, as, false) -- AC_CHECK_TOOL(OBJDUMP, objdump, false) -- ;; -- ]) --esac -+# AC_DISABLE_SHARED -+# ----------------- -+# set the default shared flag to --disable-shared -+AC_DEFUN([AC_DISABLE_SHARED], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_SHARED(no) -+])# AC_DISABLE_SHARED - --need_locks="$enable_libtool_lock" - --])# _LT_AC_LOCK -+# AC_ENABLE_STATIC([DEFAULT]) -+# --------------------------- -+# implement the --enable-static flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_STATIC], -+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([static], -+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]AC_ENABLE_STATIC_DEFAULT) -+])# AC_ENABLE_STATIC - - --# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) --# ---------------------------------------------------------------- --# Check whether the given compiler option works --AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], --[AC_REQUIRE([LT_AC_PROG_SED]) --AC_CACHE_CHECK([$1], [$2], -- [$2=no -- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- lt_compiler_flag="$3" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -- -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -- if (exit $ac_status) && test -s "$ac_outfile"; then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings other than the usual output. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- $2=yes -- fi -- fi -- $rm conftest* --]) -+# AC_DISABLE_STATIC -+# ----------------- -+# set the default static flag to --disable-static -+AC_DEFUN([AC_DISABLE_STATIC], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_STATIC(no) -+])# AC_DISABLE_STATIC - --if test x"[$]$2" = xyes; then -- ifelse([$5], , :, [$5]) --else -- ifelse([$6], , :, [$6]) --fi --])# AC_LIBTOOL_COMPILER_OPTION - -+# AC_ENABLE_FAST_INSTALL([DEFAULT]) -+# --------------------------------- -+# implement the --enable-fast-install flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_FAST_INSTALL], -+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([fast-install], -+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -+])# AC_ENABLE_FAST_INSTALL - --# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [ACTION-SUCCESS], [ACTION-FAILURE]) --# ------------------------------------------------------------ --# Check whether the given compiler option works --AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], --[AC_CACHE_CHECK([$1], [$2], -- [$2=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $3" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -- # The linker can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test -s conftest.err; then -- # Append any errors to the config.log. -- cat conftest.err 1>&AS_MESSAGE_LOG_FD -- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if diff conftest.exp conftest.er2 >/dev/null; then -- $2=yes -- fi -- else -- $2=yes -- fi -- fi -- $rm conftest* -- LDFLAGS="$save_LDFLAGS" --]) - --if test x"[$]$2" = xyes; then -- ifelse([$4], , :, [$4]) --else -- ifelse([$5], , :, [$5]) --fi --])# AC_LIBTOOL_LINKER_OPTION -+# AC_DISABLE_FAST_INSTALL -+# ----------------------- -+# set the default to --disable-fast-install -+AC_DEFUN([AC_DISABLE_FAST_INSTALL], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_FAST_INSTALL(no) -+])# AC_DISABLE_FAST_INSTALL - - --# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# AC_LIBTOOL_PICMODE([MODE]) - # -------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], --[# find the maximum length of command line arguments --AC_MSG_CHECKING([the maximum length of command line arguments]) --AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -- i=0 -- teststring="ABCD" -+# implement the --with-pic flag -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+AC_DEFUN([AC_LIBTOOL_PICMODE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+pic_mode=ifelse($#,1,$1,default) -+])# AC_LIBTOOL_PICMODE - -- case $build_os in -- msdosdjgpp*) -- # On DJGPP, this test can blow up pretty badly due to problems in libc -- # (any single argument exceeding 2000 bytes causes a buffer overrun -- # during glob expansion). Even if it were fixed, the result of this -- # check would be larger than it should be. -- lt_cv_sys_max_cmd_len=12288; # 12K is about right -- ;; - -- gnu*) -- # Under GNU Hurd, this test is not required because there is -- # no limit to the length of command line arguments. -- # Libtool will interpret -1 as no limit whatsoever -- lt_cv_sys_max_cmd_len=-1; -- ;; -+# AC_PROG_EGREP -+# ------------- -+# This is predefined starting with Autoconf 2.54, so this conditional -+# definition can be removed once we require Autoconf 2.54 or later. -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi]) -+ EGREP=$ac_cv_prog_egrep -+ AC_SUBST([EGREP]) -+])]) - -- cygwin* | mingw*) -- # On Win9x/ME, this test blows up -- it succeeds, but takes -- # about 5 minutes as the teststring grows exponentially. -- # Worse, since 9x/ME are not pre-emptively multitasking, -- # you end up with a "frozen" computer, even though with patience -- # the test eventually succeeds (with a max line length of 256k). -- # Instead, let's just punt: use the minimum linelength reported by -- # all of the supported platforms: 8192 (on NT/2K/XP). -- lt_cv_sys_max_cmd_len=8192; -- ;; - -- amigaos*) -- # On AmigaOS with pdksh, this test takes hours, literally. -- # So we just punt and use a minimum line length of 8192. -- lt_cv_sys_max_cmd_len=8192; -- ;; -+# AC_PATH_TOOL_PREFIX -+# ------------------- -+# find a file program which can recognize shared library -+AC_DEFUN([AC_PATH_TOOL_PREFIX], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="ifelse([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 - -- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -- # This has been around since 386BSD, at least. Likely further. -- if test -x /sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -- elif test -x /usr/sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -- else -- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break - fi -- # And add a safety zone -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -- ;; -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+])# AC_PATH_TOOL_PREFIX - -- interix*) -- # We know the value 262144 and hardcode it with a safety zone (like BSD) -- lt_cv_sys_max_cmd_len=196608 -- ;; - -- osf*) -- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -- # nice to cause kernel panics so lets avoid the loop below. -- # First set a reasonable default. -- lt_cv_sys_max_cmd_len=16384 -- # -- if test -x /sbin/sysconfig; then -- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -- *1*) lt_cv_sys_max_cmd_len=-1 ;; -- esac -- fi -- ;; -- sco3.2v5*) -- lt_cv_sys_max_cmd_len=102400 -- ;; -- sysv5* | sco5v6* | sysv4.2uw2*) -- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -- if test -n "$kargmax"; then -- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -- else -- lt_cv_sys_max_cmd_len=32768 -- fi -+# AC_PATH_MAGIC -+# ------------- -+# find a file program which can recognize a shared library -+AC_DEFUN([AC_PATH_MAGIC], -+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ else -+ MAGIC_CMD=: -+ fi -+fi -+])# AC_PATH_MAGIC -+ -+ -+# AC_PROG_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([AC_PROG_LD], -+[AC_ARG_WITH([gnu-ld], -+ [AC_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no]) -+AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld - ;; - *) -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -- = "XX$teststring") >/dev/null 2>&1 && -- new_result=`expr "X$teststring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -- done -- teststring= -- # Add a significant safety factor because C++ compilers can tack on massive -- # amounts of additional arguments before passing them to the linker. -- # It appears as though 1/2 is a usable value. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown - ;; - esac --]) --if test -n $lt_cv_sys_max_cmd_len ; then -- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) - else -- AC_MSG_RESULT(none) -+ AC_MSG_CHECKING([for non-GNU ld]) - fi --])# AC_LIBTOOL_SYS_MAX_CMD_LEN -- -- --# _LT_AC_CHECK_DLFCN --# ------------------ --AC_DEFUN([_LT_AC_CHECK_DLFCN], --[AC_CHECK_HEADERS(dlfcn.h)dnl --])# _LT_AC_CHECK_DLFCN -- -- --# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, --# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) --# --------------------------------------------------------------------- --AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], --[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl --if test "$cross_compiling" = yes; then : -- [$4] -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 conftest.$ac_ext < --#endif - --#include -+# AC_PROG_LD_GNU -+# -------------- -+AC_DEFUN([AC_PROG_LD_GNU], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -+[# I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 /dev/null; then -- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) $1 ;; -- x$lt_dlneed_uscore) $2 ;; -- x$lt_dlunknown|x*) $3 ;; -- esac -- else : -- # compilation failed -- $3 -- fi --fi --rm -fr conftest* --])# _LT_AC_TRY_DLOPEN_SELF -+beos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+bsdi[[45]]*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -+ lt_cv_file_magic_cmd='/usr/bin/file -L' -+ lt_cv_file_magic_test_file=/shlib/libc.so -+ ;; - --# AC_LIBTOOL_DLOPEN_SELF --# ---------------------- --AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], --[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -+cygwin*) -+ # func_win32_libid is a shell function defined in ltmain.sh -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ ;; - -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -+mingw* | pw32*) -+ # Base MSYS/MinGW do not provide the 'file' command needed by -+ # func_win32_libid shell function, so use a weaker test based on 'objdump', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi -+ ;; - -- mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; - -- darwin*) -- # if libdl is installed we need to link against it -- AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ]) -- ;; -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; - *) -- AC_CHECK_FUNC([shl_load], -- [lt_cv_dlopen="shl_load"], -- [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -- [AC_CHECK_FUNC([dlopen], -- [lt_cv_dlopen="dlopen"], -- [AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -- [AC_CHECK_LIB([svld], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -- [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -- ]) -- ]) -- ]) -- ]) -- ]) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -+ ;; - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -+interix[[3-9]]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -- enable_dlopen=no -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi -+ ;; - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; - -- save_LDFLAGS="$LDFLAGS" -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; - -- AC_CACHE_CHECK([whether a program can dlopen itself], -- lt_cv_dlopen_self, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -- ]) -- -- if test "x$lt_cv_dlopen_self" = xyes; then -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -- lt_cv_dlopen_self_static, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -- ]) -- fi -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac --fi --])# AC_LIBTOOL_DLOPEN_SELF -- -- --# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) --# --------------------------------- --# Check to see if options -c and -o are simultaneously supported by compiler --AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl --AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -- $rm -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ ;; - -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -- -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -- if (exit $ac_status) && test -s out/conftest2.$ac_objext -- then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -- fi -- fi -- chmod u+w . 2>&AS_MESSAGE_LOG_FD -- $rm conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -- $rm out/* && rmdir out -- cd .. -- rmdir conftest -- $rm conftest* -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac - ]) --])# AC_LIBTOOL_PROG_CC_C_O -- -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown -+])# AC_DEPLIBS_CHECK_METHOD - --# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) --# ----------------------------------------- --# Check to see if we can do hard links to lock some files if needed --AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], --[AC_REQUIRE([_LT_AC_LOCK])dnl - --hard_links="nottested" --if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- AC_MSG_CHECKING([if we can lock with hard links]) -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- AC_MSG_RESULT([$hard_links]) -- if test "$hard_links" = no; then -- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -- need_locks=warn -- fi -+# AC_PROG_NM -+# ---------- -+# find the pathname to a BSD-compatible name lister -+AC_DEFUN([AC_PROG_NM], -+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" - else -- need_locks=no --fi --])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done -+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+fi]) -+NM="$lt_cv_path_NM" -+])# AC_PROG_NM - - --# AC_LIBTOOL_OBJDIR --# ----------------- --AC_DEFUN([AC_LIBTOOL_OBJDIR], --[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], --[rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- lt_cv_objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- lt_cv_objdir=_libs --fi --rmdir .libs 2>/dev/null]) --objdir=$lt_cv_objdir --])# AC_LIBTOOL_OBJDIR -+# AC_CHECK_LIBM -+# ------------- -+# check for math library -+AC_DEFUN([AC_CHECK_LIBM], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it -+ ;; -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ ;; -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") -+ ;; -+esac -+])# AC_CHECK_LIBM - - --# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) --# ---------------------------------------------- --# Check hardcoding attributes. --AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], --[AC_MSG_CHECKING([how to hardcode library paths into programs]) --_LT_AC_TAGVAR(hardcode_action, $1)= --if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl convenience library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-convenience to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -+# (note the single quotes!). If your package is not flat and you're not -+# using automake, define top_builddir and top_srcdir appropriately in -+# the Makefiles. -+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ case $enable_ltdl_convenience in -+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -+ "") enable_ltdl_convenience=yes -+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -+ esac -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_CONVENIENCE - -- # We can hardcode non-existant directories. -- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -- # Linking always hardcodes the temporary library directory. -- _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ -+# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl installable library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-install to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# and an installed libltdl is not found, it is assumed to be `libltdl'. -+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and top_srcdir -+# appropriately in the Makefiles. -+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ AC_CHECK_LIB(ltdl, lt_dlinit, -+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -+ [if test x"$enable_ltdl_install" = xno; then -+ AC_MSG_WARN([libltdl not installed, but installation disabled]) -+ else -+ enable_ltdl_install=yes -+ fi -+ ]) -+ if test x"$enable_ltdl_install" = x"yes"; then -+ ac_configure_args="$ac_configure_args --enable-ltdl-install" -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- _LT_AC_TAGVAR(hardcode_action, $1)=immediate -+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -+ LIBLTDL="-lltdl" -+ LTDLINCL= - fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported --fi --AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_INSTALLABLE - --if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi --])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - -+# AC_LIBTOOL_CXX -+# -------------- -+# enable support for C++ libraries -+AC_DEFUN([AC_LIBTOOL_CXX], -+[AC_REQUIRE([_LT_AC_LANG_CXX]) -+])# AC_LIBTOOL_CXX - --# AC_LIBTOOL_SYS_LIB_STRIP --# ------------------------ --AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], --[striplib= --old_striplib= --AC_MSG_CHECKING([whether stripping libraries is possible]) --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- AC_MSG_RESULT([yes]) --else --# FIXME - insert some real tests, host_os isn't really good enough -- case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) --fi -- ;; -- *) -- AC_MSG_RESULT([no]) -- ;; -- esac --fi --])# AC_LIBTOOL_SYS_LIB_STRIP - -+# _LT_AC_LANG_CXX -+# --------------- -+AC_DEFUN([_LT_AC_LANG_CXX], -+[AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -+])# _LT_AC_LANG_CXX - --# AC_LIBTOOL_SYS_DYNAMIC_LINKER --# ----------------------------- --# PORTME Fill in your ld.so characteristics --AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], --[AC_MSG_CHECKING([dynamic linker characteristics]) --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -- # if the path contains ";" then we assume it to be the separator -- # otherwise default to the standard path separator (i.e. ":") - it is -- # assumed that no part of a normal pathname contains ";" but that should -- # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP - fi --need_lib_prefix=unknown --hardcode_into_libs=no -+])# _LT_AC_PROG_CXXCPP - --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --need_version=unknown -+# AC_LIBTOOL_F77 -+# -------------- -+# enable support for Fortran 77 libraries -+AC_DEFUN([AC_LIBTOOL_F77], -+[AC_REQUIRE([_LT_AC_LANG_F77]) -+])# AC_LIBTOOL_F77 - --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -- shlibpath_var=LIBPATH - -- # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -+# _LT_AC_LANG_F77 -+# --------------- -+AC_DEFUN([_LT_AC_LANG_F77], -+[AC_REQUIRE([AC_PROG_F77]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -+])# _LT_AC_LANG_F77 - --aix4* | aix5*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[[01]] | aix4.[[01]].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -- # soname into executable. Probably we can add versioning support to -- # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib.so -- # instead of lib.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -- shlibpath_var=LIBPATH -- fi -- ;; - --amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -- ;; -+# AC_LIBTOOL_GCJ -+# -------------- -+# enable support for GCJ libraries -+AC_DEFUN([AC_LIBTOOL_GCJ], -+[AC_REQUIRE([_LT_AC_LANG_GCJ]) -+])# AC_LIBTOOL_GCJ - --beos*) -- library_names_spec='${libname}${shared_ext}' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- ;; - --bsdi[[45]]*) -- version_type=linux -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; -+# _LT_AC_LANG_GCJ -+# --------------- -+AC_DEFUN([_LT_AC_LANG_GCJ], -+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -+])# _LT_AC_LANG_GCJ - --cygwin* | mingw* | pw32*) -- version_type=windows -- shrext_cmds=".dll" -- need_version=no -- need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -- library_names_spec='$libname.dll.a' -- # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname' -- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $rm \$dlpath' -- shlibpath_overrides_runpath=yes -+# AC_LIBTOOL_RC -+# ------------- -+# enable support for Windows resource files -+AC_DEFUN([AC_LIBTOOL_RC], -+[AC_REQUIRE([LT_AC_PROG_RC]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -+])# AC_LIBTOOL_RC - -- case $host_os in -- cygwin*) -- # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -- ;; -- mingw*) -- # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi -- ;; -- pw32*) -- # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- ;; -- esac -- ;; - -- *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; -+# AC_LIBTOOL_LANG_C_CONFIG -+# ------------------------ -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -+AC_DEFUN([_LT_AC_LANG_C_CONFIG], -+[lt_save_CC="$CC" -+AC_LANG_PUSH(C) - --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -- ;; -+# Source file extension for C test sources. -+ac_ext=c - --dgux*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+# Object file extension for compiled C test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - --freebsd1*) -- dynamic_linker=no -- ;; -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" - --kfreebsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' -+ -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF -+ -+# Report which library types will actually be built -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) -+ -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi - ;; - --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -- if test -x /usr/bin/objformat; then -- objformat=`/usr/bin/objformat` -- else -- case $host_os in -- freebsd[[123]]*) objformat=aout ;; -- *) objformat=elf ;; -- esac -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no - fi -- version_type=freebsd-$objformat -- case $version_type in -- freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -- need_version=yes -- ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- freebsd3.[[01]]* | freebsdelf3.[[01]]*) -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes - ;; -- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- freebsd*) # from 4.6 on -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- esac -- ;; -+esac -+AC_MSG_RESULT([$enable_shared]) - --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- ;; -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) - --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- case $host_cpu in -- ia64*) -- shrext_cmds='.so' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.so" -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -- else -- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -- fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -- shrext_cmds='.sl' -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -- ;; -+AC_LIBTOOL_CONFIG($1) - --interix3*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_C_CONFIG - --irix5* | irix6* | nonstopux*) -- case $host_os in -- nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -- esac -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -- case $host_os in -- irix5* | nonstopux*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- hardcode_into_libs=yes -- ;; - --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; -+# AC_LIBTOOL_LANG_CXX_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -+[AC_LANG_PUSH(C++) -+AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - --# This must be Linux ELF. --linux*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -+# Dependencies to place before and after the object being linked: -+_LT_AC_TAGVAR(predep_objects, $1)= -+_LT_AC_TAGVAR(postdep_objects, $1)= -+_LT_AC_TAGVAR(predeps, $1)= -+_LT_AC_TAGVAR(postdeps, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_path, $1)= - -- # Append ld.so.conf contents to the search path -- if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -- fi -+# Source file extension for C++ test sources. -+ac_ext=cpp - -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - --knetbsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -- ;; -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" - --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER - --nto-qnx*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+else -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+fi - --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration - --solaris*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -+ AC_PROG_LD - --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - --sysv4 | sysv4.3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' - --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi - else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -- esac -- fi -- sys_lib_dlsearch_path_spec='/usr/lib' -- ;; -+ with_gnu_ld=no -+ wlarc= - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi - --*) -- dynamic_linker=no -- ;; --esac --AC_MSG_RESULT([$dynamic_linker]) --test "$dynamic_linker" = no && can_build_shared=no -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= - fi --])# AC_LIBTOOL_SYS_DYNAMIC_LINKER -- -- --# _LT_AC_TAGCONFIG --# ---------------- --AC_DEFUN([_LT_AC_TAGCONFIG], --[AC_ARG_WITH([tags], -- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -- [include additional configurations @<:@automatic@:>@])], -- [tagnames="$withval"]) -- --if test -f "$ltmain" && test -n "$tagnames"; then -- if test ! -f "${ofile}"; then -- AC_MSG_WARN([output file `$ofile' does not exist]) -- fi - -- if test -z "$LTCC"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -- if test -z "$LTCC"; then -- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -+# PORTME: fill in a description of your system's C++ link characteristics -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+_LT_AC_TAGVAR(ld_shlibs, $1)=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" - else -- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) -- fi -- fi -- if test -z "$LTCFLAGS"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -- fi -- -- # Extract list of available tagged configurations in $ofile. -- # Note that this assumes the entire list is on one line. -- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ aix_use_runtimelinking=no - -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for tagname in $tagnames; do -- IFS="$lt_save_ifs" -- # Check whether tagname contains only valid characters -- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -- "") ;; -- *) AC_MSG_ERROR([invalid tag name: $tagname]) -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done - ;; -- esac -+ esac - -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -- then -- AC_MSG_ERROR([tag name \"$tagname\" already exists]) -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' - fi - -- # Update the list of available tags. -- if test -n "$tagname"; then -- echo appending configuration tag \"$tagname\" to $ofile -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - -- case $tagname in -- CXX) -- if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- AC_LIBTOOL_LANG_CXX_CONFIG -- else -- tagname="" -- fi -- ;; -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - -- F77) -- if test -n "$F77" && test "X$F77" != "Xno"; then -- AC_LIBTOOL_LANG_F77_CONFIG -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : - else -- tagname="" -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; -- -- GCJ) -- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -- AC_LIBTOOL_LANG_GCJ_CONFIG -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' - else -- tagname="" -+ shared_flag='${wl}-bM:SRE' - fi -- ;; -- -- RC) -- AC_LIBTOOL_LANG_RC_CONFIG -- ;; -- -- *) -- AC_MSG_ERROR([Unsupported tag name: $tagname]) -- ;; -- esac -- -- # Append the new tag name to the list of available tags. -- if test -n "$tagname" ; then -- available_tags="$available_tags $tagname" -- fi -+ fi - fi -- done -- IFS="$lt_save_ifs" - -- # Now substitute the updated list of available tags. -- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -- mv "${ofile}T" "$ofile" -- chmod +x "$ofile" -- else -- rm -f "${ofile}T" -- AC_MSG_ERROR([unable to update list of available tagged configurations.]) -- fi --fi --])# _LT_AC_TAGCONFIG -- -- --# AC_LIBTOOL_DLOPEN --# ----------------- --# enable checks for dlopen support --AC_DEFUN([AC_LIBTOOL_DLOPEN], -- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) --])# AC_LIBTOOL_DLOPEN -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# AC_LIBTOOL_WIN32_DLL --# -------------------- --# declare package support for building win32 DLLs --AC_DEFUN([AC_LIBTOOL_WIN32_DLL], --[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) --])# AC_LIBTOOL_WIN32_DLL -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - --# AC_ENABLE_SHARED([DEFAULT]) --# --------------------------- --# implement the --enable-shared flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_SHARED], --[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([shared], -- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_shared=yes ;; -- no) enable_shared=no ;; -- *) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) --])# AC_ENABLE_SHARED -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --# AC_DISABLE_SHARED --# ----------------- --# set the default shared flag to --disable-shared --AC_DEFUN([AC_DISABLE_SHARED], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_SHARED(no) --])# AC_DISABLE_SHARED -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ freebsd-elf*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. - --# AC_ENABLE_STATIC([DEFAULT]) --# --------------------------- --# implement the --enable-static flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_STATIC], --[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([static], -- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_static=yes ;; -- no) enable_static=no ;; -- *) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$lt_save_ifs" -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; -- esac], -- [enable_static=]AC_ENABLE_STATIC_DEFAULT) --])# AC_ENABLE_STATIC -- -- --# AC_DISABLE_STATIC --# ----------------- --# set the default static flag to --disable-static --AC_DEFUN([AC_DISABLE_STATIC], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_STATIC(no) --])# AC_DISABLE_STATIC -- -- --# AC_ENABLE_FAST_INSTALL([DEFAULT]) --# --------------------------------- --# implement the --enable-fast-install flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_FAST_INSTALL], --[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([fast-install], -- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_fast_install=yes ;; -- no) enable_fast_install=no ;; - *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$lt_save_ifs" -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi - ;; -- esac], -- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) --])# AC_ENABLE_FAST_INSTALL -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac - --# AC_DISABLE_FAST_INSTALL --# ----------------------- --# set the default to --disable-fast-install --AC_DEFUN([AC_DISABLE_FAST_INSTALL], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_FAST_INSTALL(no) --])# AC_DISABLE_FAST_INSTALL -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler - --# AC_LIBTOOL_PICMODE([MODE]) --# -------------------------- --# implement the --with-pic flag --# MODE is either `yes' or `no'. If omitted, it defaults to `both'. --AC_DEFUN([AC_LIBTOOL_PICMODE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --pic_mode=ifelse($#,1,$1,default) --])# AC_LIBTOOL_PICMODE -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - --# AC_PROG_EGREP --# ------------- --# This is predefined starting with Autoconf 2.54, so this conditional --# definition can be removed once we require Autoconf 2.54 or later. --m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], --[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi]) -- EGREP=$ac_cv_prog_egrep -- AC_SUBST([EGREP]) --])]) -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc*) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - --# AC_PATH_TOOL_PREFIX --# ------------------- --# find a file program which can recognise shared library --AC_DEFUN([AC_PATH_TOOL_PREFIX], --[AC_REQUIRE([AC_PROG_EGREP])dnl --AC_MSG_CHECKING([for $1]) --AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, --[case $MAGIC_CMD in --[[\\/*] | ?:[\\/]*]) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; --*) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR --dnl $ac_dummy forces splitting on constant user-supplied paths. --dnl POSIX.2 word splitting is done only on the output of word expansions, --dnl not every word. This closes a longstanding sh security hole. -- ac_dummy="ifelse([$2], , $PATH, [$2])" -- for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$1; then -- lt_cv_path_MAGIC_CMD="$ac_dir/$1" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- $EGREP "$file_magic_regex" > /dev/null; then -- : -- else -- cat <&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - --EOF -- fi ;; -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; - esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi -- break -+ output_verbose_link_cmd='echo' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi -- done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -- ;; --esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- AC_MSG_RESULT($MAGIC_CMD) --else -- AC_MSG_RESULT(no) --fi --])# AC_PATH_TOOL_PREFIX -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler - -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - --# AC_PATH_MAGIC --# ------------- --# find a file program which can recognise a shared library --AC_DEFUN([AC_PATH_MAGIC], --[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -- else -- MAGIC_CMD=: -- fi --fi --])# AC_PATH_MAGIC -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - --# AC_PROG_LD --# ---------- --# find the pathname to the GNU or non-GNU linker --AC_DEFUN([AC_PROG_LD], --[AC_ARG_WITH([gnu-ld], -- [AC_HELP_STRING([--with-gnu-ld], -- [assume the C compiler uses GNU ld @<:@default=no@:>@])], -- [test "$withval" = no || with_gnu_ld=yes], -- [with_gnu_ld=no]) --AC_REQUIRE([LT_AC_PROG_SED])dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by $CC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]]* | ?:[[\\/]]*) -- re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) --else -- AC_MSG_CHECKING([for non-GNU ld]) --fi --AC_CACHE_VAL(lt_cv_path_LD, --[if test -z "$LD"; then -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some variants of GNU ld only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then -- case $host_cpu in -- i*86 ) -- # Not sure whether the presence of OpenBSD here was a mistake. -- # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -- ;; -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - esac -- else -- lt_cv_deplibs_check_method=pass_all -- fi -- ;; -- --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --hpux10.20* | hpux11*) -- lt_cv_file_magic_cmd=/usr/bin/file -- case $host_cpu in -- ia64*) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; -- hppa*64*) -- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- *) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - ;; -- esac -- ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - --interix3*) -- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -- ;; -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --irix5* | irix6* | nonstopux*) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- lt_cv_deplibs_check_method=pass_all -- ;; -+ output_verbose_link_cmd='echo' - --# This must be Linux ELF. --linux*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - --netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -- fi -- ;; -+ # The C++ compiler must be used to create the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - --nto-qnx*) -- lt_cv_deplibs_check_method=unknown -- ;; -- --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -- fi -- ;; -- --osf3* | osf4* | osf5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --solaris*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi - --sysv4 | sysv4.3*) -- case $host_vendor in -- motorola) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac - ;; -- ncr) -- lt_cv_deplibs_check_method=pass_all -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; -- sequent) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; -- sni) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -- lt_cv_file_magic_test_file=/lib/libc.so -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - ;; -- siemens) -- lt_cv_deplibs_check_method=pass_all -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- pc) -- lt_cv_deplibs_check_method=pass_all -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- esac -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all -- ;; - esac --]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --test -z "$deplibs_check_method" && deplibs_check_method=unknown --])# AC_DEPLIBS_CHECK_METHOD -- -- --# AC_PROG_NM --# ---------- --# find the pathname to a BSD-compatible name lister --AC_DEFUN([AC_PROG_NM], --[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, --[if test -n "$NM"; then -- # Let the user override the test. -- lt_cv_path_NM="$NM" --else -- lt_nm_to_check="${ac_tool_prefix}nm" -- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -- lt_nm_to_check="$lt_nm_to_check nm" -- fi -- for lt_tmp_nm in $lt_nm_to_check; do -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- tmp_nm="$ac_dir/$lt_tmp_nm" -- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- # Tru64's nm complains that /dev/null is an invalid object file -- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -- */dev/null* | *'Invalid file or object type'*) -- lt_cv_path_NM="$tmp_nm -B" -- break -- ;; -- *) -- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -- */dev/null*) -- lt_cv_path_NM="$tmp_nm -p" -- break -- ;; -- *) -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -- ;; -- esac -- ;; -- esac -- fi -- done -- IFS="$lt_save_ifs" -- done -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm --fi]) --NM="$lt_cv_path_NM" --])# AC_PROG_NM -- -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - --# AC_CHECK_LIBM --# ------------- --# check for math library --AC_DEFUN([AC_CHECK_LIBM], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --LIBM= --case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -- # These system don't have libm, or don't need it -- ;; --*-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -- ;; --*) -- AC_CHECK_LIB(m, cos, LIBM="-lm") -- ;; --esac --])# AC_CHECK_LIBM -+_LT_AC_TAGVAR(GCC, $1)="$GXX" -+_LT_AC_TAGVAR(LD, $1)="$LD" - -+AC_LIBTOOL_POSTDEP_PREDEP($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - --# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) --# ----------------------------------- --# sets LIBLTDL to the link flags for the libltdl convenience library and --# LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-convenience to the configure arguments. Note that --# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, --# it is assumed to be `libltdl'. LIBLTDL will be prefixed with --# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' --# (note the single quotes!). If your package is not flat and you're not --# using automake, define top_builddir and top_srcdir appropriately in --# the Makefiles. --AC_DEFUN([AC_LIBLTDL_CONVENIENCE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- case $enable_ltdl_convenience in -- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -- esac -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" --])# AC_LIBLTDL_CONVENIENCE -+AC_LIBTOOL_CONFIG($1) - -+AC_LANG_POP -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+])# AC_LIBTOOL_LANG_CXX_CONFIG - --# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) --# ----------------------------------- --# sets LIBLTDL to the link flags for the libltdl installable library and --# LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-install to the configure arguments. Note that --# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, --# and an installed libltdl is not found, it is assumed to be `libltdl'. --# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with --# '${top_srcdir}/' (note the single quotes!). If your package is not --# flat and you're not using automake, define top_builddir and top_srcdir --# appropriately in the Makefiles. --# In the future, this macro may have to be called after AC_PROG_LIBTOOL. --AC_DEFUN([AC_LIBLTDL_INSTALLABLE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- AC_CHECK_LIB(ltdl, lt_dlinit, -- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -- [if test x"$enable_ltdl_install" = xno; then -- AC_MSG_WARN([libltdl not installed, but installation disabled]) -- else -- enable_ltdl_install=yes -- fi -- ]) -- if test x"$enable_ltdl_install" = x"yes"; then -- ac_configure_args="$ac_configure_args --enable-ltdl-install" -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- else -- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- LTDLINCL= -- fi -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" --])# AC_LIBLTDL_INSTALLABLE -+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -+# ------------------------------------ -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext </dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- AC_PROG_CXXCPP --fi --])# _LT_AC_PROG_CXXCPP -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -+ else -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then -+ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" -+ else -+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" -+ fi -+ fi -+ ;; - --# AC_LIBTOOL_F77 --# -------------- --# enable support for Fortran 77 libraries --AC_DEFUN([AC_LIBTOOL_F77], --[AC_REQUIRE([_LT_AC_LANG_F77]) --])# AC_LIBTOOL_F77 -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi - -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then -+ _LT_AC_TAGVAR(predep_objects, $1)="$p" -+ else -+ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" -+ fi -+ else -+ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then -+ _LT_AC_TAGVAR(postdep_objects, $1)="$p" -+ else -+ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" -+ fi -+ fi -+ ;; - --# _LT_AC_LANG_F77 --# --------------- --AC_DEFUN([_LT_AC_LANG_F77], --[AC_REQUIRE([AC_PROG_F77]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) --])# _LT_AC_LANG_F77 -+ *) ;; # Ignore the rest. - -+ esac -+ done - --# AC_LIBTOOL_GCJ --# -------------- --# enable support for GCJ libraries --AC_DEFUN([AC_LIBTOOL_GCJ], --[AC_REQUIRE([_LT_AC_LANG_GCJ]) --])# AC_LIBTOOL_GCJ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling $1 test program" -+fi - -+$rm -f confest.$objext - --# _LT_AC_LANG_GCJ --# --------------- --AC_DEFUN([_LT_AC_LANG_GCJ], --[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) --])# _LT_AC_LANG_GCJ -+# PORTME: override above test on systems where it is broken -+ifelse([$1],[CXX], -+[case $host_os in -+interix[[3-9]]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ _LT_AC_TAGVAR(predep_objects,$1)= -+ _LT_AC_TAGVAR(postdep_objects,$1)= -+ _LT_AC_TAGVAR(postdeps,$1)= -+ ;; - -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; - --# AC_LIBTOOL_RC --# ------------- --# enable support for Windows resource files --AC_DEFUN([AC_LIBTOOL_RC], --[AC_REQUIRE([LT_AC_PROG_RC]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) --])# AC_LIBTOOL_RC -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac - -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) - --# AC_LIBTOOL_LANG_C_CONFIG --# ------------------------ -+case " $_LT_AC_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+])# AC_LIBTOOL_POSTDEP_PREDEP -+ -+# AC_LIBTOOL_LANG_F77_CONFIG -+# -------------------------- - # Ensure that the configuration vars for the C compiler are - # suitably defined. Those variables are subsequently used by - # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) --AC_DEFUN([_LT_AC_LANG_C_CONFIG], --[lt_save_CC="$CC" --AC_LANG_PUSH(C) -- --# Source file extension for C test sources. --ac_ext=c -+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -+AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -+[AC_REQUIRE([AC_PROG_F77]) -+AC_LANG_PUSH(Fortran 77) - --# Object file extension for compiled C test sources. -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. - objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code="\ -+ program t -+ end -+" - -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - --AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) --AC_LIBTOOL_SYS_LIB_STRIP --AC_LIBTOOL_DLOPEN_SELF -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - --# Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - -@@ -4972,12 +4531,11 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; -- - aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -- ;; -+ ;; - esac - AC_MSG_RESULT([$enable_shared]) - -@@ -4986,63 +4544,44 @@ - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - -+_LT_AC_TAGVAR(GCC, $1)="$G77" -+_LT_AC_TAGVAR(LD, $1)="$LD" -+ -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ - AC_LIBTOOL_CONFIG($1) - - AC_LANG_POP - CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_C_CONFIG -+])# AC_LIBTOOL_LANG_F77_CONFIG - - --# AC_LIBTOOL_LANG_CXX_CONFIG -+# AC_LIBTOOL_LANG_GCJ_CONFIG - # -------------------------- - # Ensure that the configuration vars for the C compiler are - # suitably defined. Those variables are subsequently used by - # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) --AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], --[AC_LANG_PUSH(C++) --AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -- --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_AC_TAGVAR(allow_undefined_flag, $1)= --_LT_AC_TAGVAR(always_export_symbols, $1)=no --_LT_AC_TAGVAR(archive_expsym_cmds, $1)= --_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_direct, $1)=no --_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= --_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= --_LT_AC_TAGVAR(hardcode_minus_L, $1)=no --_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported --_LT_AC_TAGVAR(hardcode_automatic, $1)=no --_LT_AC_TAGVAR(module_cmds, $1)= --_LT_AC_TAGVAR(module_expsym_cmds, $1)= --_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown --_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_AC_TAGVAR(no_undefined_flag, $1)= --_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= --_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- --# Dependencies to place before and after the object being linked: --_LT_AC_TAGVAR(predep_objects, $1)= --_LT_AC_TAGVAR(postdep_objects, $1)= --_LT_AC_TAGVAR(predeps, $1)= --_LT_AC_TAGVAR(postdeps, $1)= --_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -+[AC_LANG_SAVE - --# Source file extension for C++ test sources. --ac_ext=cpp -+# Source file extension for Java test sources. -+ac_ext=java - --# Object file extension for compiled C++ test sources. -+# Object file extension for compiled Java test sources. - objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="class foo {}" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER -@@ -5052,2046 +4591,812 @@ - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC=$CC --lt_save_LD=$LD --lt_save_GCC=$GCC --GCC=$GXX --lt_save_with_gnu_ld=$with_gnu_ld --lt_save_path_LD=$lt_cv_path_LD --if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx --else -- $as_unset lt_cv_prog_gnu_ld --fi --if test -n "${lt_cv_path_LDCXX+set}"; then -- lt_cv_path_LD=$lt_cv_path_LDCXX --else -- $as_unset lt_cv_path_LD --fi --test -z "${LDCXX+set}" || LD=$LDCXX --CC=${CXX-"c++"} -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - --# We don't want -fno-exception wen compiling C++ code, so set the --# no_builtin_flag separately --if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' --else -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= --fi -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - --if test "$GXX" = yes; then -- # Set up default GNU C++ configuration -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -- AC_PROG_LD -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - -- # Check if GNU C++ uses GNU ld as the underlying linker, since the -- # archiving commands below assume that GNU ld is being used. -- if test "$with_gnu_ld" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+AC_LIBTOOL_CONFIG($1) - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_GCJ_CONFIG - -- # If archive_cmds runs LD, not CC, wlarc should be empty -- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -- # investigate it a little bit more. (MM) -- wlarc='${wl}' - -- # ancient GNU ld didn't support --whole-archive et. al. -- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -- grep 'no-whole-archive' > /dev/null; then -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- else -- with_gnu_ld=no -- wlarc= -+# AC_LIBTOOL_LANG_RC_CONFIG -+# ------------------------- -+# Ensure that the configuration vars for the Windows resource compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -+AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -+[AC_LANG_SAVE - -- # A generic and very simple default shared library creation -- # command for GNU C++ for the case where it uses the native -- # linker, instead of GNU ld. If possible, this setting should -- # overridden to take advantage of the native linker features on -- # the platform it is being used on. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- fi -+# Source file extension for RC test sources. -+ac_ext=rc - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - --else -- GXX=no -- with_gnu_ld=no -- wlarc= --fi -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - --# PORTME: fill in a description of your system's C++ link characteristics --AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) --_LT_AC_TAGVAR(ld_shlibs, $1)=yes --case $host_os in -- aix3*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -- for ld_flag in $LDFLAGS; do -- case $ld_flag in -- *-brtl*) -- aix_use_runtimelinking=yes -- break -- ;; -- esac -- done -- ;; -- esac -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -- _LT_AC_TAGVAR(archive_cmds, $1)='' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+AC_LIBTOOL_CONFIG($1) - -- if test "$GXX" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- else -- # We have old collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -- -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_RC_CONFIG - -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi -- ;; - -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# AC_LIBTOOL_CONFIG([TAGNAME]) -+# ---------------------------- -+# If TAGNAME is not passed, then create an initial libtool script -+# with a default configuration from the untagged config vars. Otherwise -+# add code to config.status for appending the configuration named by -+# TAGNAME from the matching tagged config vars. -+AC_DEFUN([AC_LIBTOOL_CONFIG], -+[# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # See if we are running on zsh, and set the options which allow our commands through -+ # without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ _LT_AC_TAGVAR(compiler, $1) \ -+ _LT_AC_TAGVAR(CC, $1) \ -+ _LT_AC_TAGVAR(LD, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -+ _LT_AC_TAGVAR(predep_objects, $1) \ -+ _LT_AC_TAGVAR(postdep_objects, $1) \ -+ _LT_AC_TAGVAR(predeps, $1) \ -+ _LT_AC_TAGVAR(postdeps, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(archive_cmds, $1) \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(postinstall_cmds, $1) \ -+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(no_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -+ _LT_AC_TAGVAR(hardcode_automatic, $1) \ -+ _LT_AC_TAGVAR(module_cmds, $1) \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ -+ _LT_AC_TAGVAR(exclude_expsyms, $1) \ -+ _LT_AC_TAGVAR(include_expsyms, $1); do - -- chorus*) -- case $cc_basename in -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -+ case $var in -+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; - esac -+ done -+ -+ case $lt_echo in -+ *'\[$]0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; -+ esac - -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(always_export_symbols, $1)=no -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ifelse([$1], [], -+ [cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ AC_MSG_NOTICE([creating $ofile])], -+ [cfgfile="$ofile"]) - -- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ cat <<__EOF__ >> "$cfgfile" -+ifelse([$1], [], -+[#! $SHELL - -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- case $cc_basename in -- xlc*) -- output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- ;; -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi -- ;; -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit , 1996 -+# -+# 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. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. - -- dgux*) -- case $cc_basename in -- ec++*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- freebsd[[12]]*) -- # C++ shared libraries reported to be fairly broken before switch to ELF -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- freebsd-elf*) -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- ;; -- freebsd* | kfreebsd*-gnu | dragonfly*) -- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -- # conventions -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- ;; -- gnu*) -- ;; -- hpux9*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -+# A sed program that does not truncate output. -+SED=$lt_SED - -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aCC*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- hpux10*|hpux11*) -- if test $with_gnu_ld = no; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e 1s/^X//" - -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -- ;; -- *) -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -- esac -- fi -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- ;; -- esac -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aCC*) -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes; then -- if test $with_gnu_ld = no; then -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- fi -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- interix3*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- ;; -- irix5* | irix6*) -- case $cc_basename in -- CC*) -- # SGI C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+# The names of the tagged configurations supported by this script. -+available_tags= - -- # Archives containing C++ object files must be created using -- # "CC -ar", where "CC" is the IRIX C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -- ;; -- *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -- fi -- fi -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- ;; -- esac -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -- linux*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -+# ### BEGIN LIBTOOL CONFIG], -+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -- ;; -- icpc*) -- # Intel C++ -- with_gnu_ld=yes -- # version 8.0 and above of icpc choke on multiply defined symbols -- # if we add $predep_objects and $postdep_objects, however 7.1 and -- # earlier do not add the objects themselves. -- case `$CC -V 2>&1` in -- *"Version 7."*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- *) # Version 8.0 or newer -- tmp_idyn= -- case $host_cpu in -- ia64*) tmp_idyn=' -i_dynamic';; -- esac -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- esac -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -- ;; -- pgCC*) -- # Portland Group C++ compiler -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- ;; -- cxx*) -- # Compaq C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - -- runpath_var=LD_RUN_PATH -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- esac -- ;; -- lynxos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- m88k*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -- wlarc= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -- ;; -- openbsd2*) -- # C++ shared libraries are fairly broken -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- fi -- output_verbose_link_cmd='echo' -- ;; -- osf3*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- cxx*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+# A C compiler. -+LTCC=$lt_LTCC - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+# A language-specific compiler. -+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- osf4* | osf5*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -+# Is the compiler the GNU C compiler? -+with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+# An ERE matcher. -+EGREP=$lt_EGREP - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# The linker used to build libraries. -+LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -- # Archives containing C++ object files must be created using -- # the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- cxx*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -- echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -- $rm $lib.exp' -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# A BSD-compatible nm program. -+NM=$lt_NM - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+# A symbol stripping program -+STRIP=$lt_STRIP - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- psos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- lcc*) -- # Lucid -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # linker. We must also pass each convience library through -- # to the system linker between allextract/defaultextract. -- # The C++ compiler will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl. -- # Supported since Solaris 2.6 (maybe 2.5.1?) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' -- ;; -- esac -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+# Used on cygwin: assembler. -+AS="$AS" - -- output_verbose_link_cmd='echo' -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - -- # Archives containing C++ object files must be created using -- # "CC -xar", where "CC" is the Sun C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - -- # The C++ compiler must be used to create the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -- ;; -- *) -- # GNU C++ compiler with Solaris linker -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -- if $CC --version | grep -v '^2\.7' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+# How to pass a linker flag through the compiler. -+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -- # platform. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+# Object file suffix (normally "o"). -+objext="$ac_objext" - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- fi -+# Old archive suffix (normally "a"). -+libext="$libext" - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -- fi -- ;; -- esac -- ;; -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var='LD_RUN_PATH' -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- ;; -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- # For security reasons, it is highly recommended that you always -- # use absolute paths for naming shared libraries, and exclude the -- # DT_RUNPATH tag from executables and libraries. But doing so -- # requires that you compile everything twice, which is a pain. -- # So that behaviour is only enabled if SCOABSPATH is set to a -- # non-empty value in the environment. Most likely only useful for -- # creating official distributions of packages. -- # This is a hack until libtool officially supports absolute path -- # names for shared libraries. -- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -+# Executable file suffix (normally ""). -+exeext="$exeext" - -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- vxworks*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; --esac --AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+# Additional compiler flags for building library objects. -+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+pic_mode=$pic_mode - --_LT_AC_TAGVAR(GCC, $1)="$GXX" --_LT_AC_TAGVAR(LD, $1)="$LD" -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --AC_LIBTOOL_POSTDEP_PREDEP($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - --AC_LIBTOOL_CONFIG($1) -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - --AC_LANG_POP --CC=$lt_save_CC --LDCXX=$LD --LD=$lt_save_LD --GCC=$lt_save_GCC --with_gnu_ldcxx=$with_gnu_ld --with_gnu_ld=$lt_save_with_gnu_ld --lt_cv_path_LDCXX=$lt_cv_path_LD --lt_cv_path_LD=$lt_save_path_LD --lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld --lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --])# AC_LIBTOOL_LANG_CXX_CONFIG -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - --# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) --# ------------------------------------ --# Figure out "hidden" library dependencies from verbose --# compiler output when linking a shared library. --# Parse the compiler output and extract the necessary --# objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ --dnl we can't use the lt_simple_compile_test_code here, --dnl because it contains code intended for an executable, --dnl not a library. It's possible we should let each --dnl tag define a new lt_????_link_test_code variable, --dnl but it's only used here... --ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" - --# AC_LIBTOOL_CONFIG([TAGNAME]) --# ---------------------------- --# If TAGNAME is not passed, then create an initial libtool script --# with a default configuration from the untagged config vars. Otherwise --# add code to config.status for appending the configuration named by --# TAGNAME from the matching tagged config vars. --AC_DEFUN([AC_LIBTOOL_CONFIG], --[# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # See if we are running on zsh, and set the options which allow our commands through -- # without removal of \ escapes. -- if test -n "${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF -+ ;; -+ esac -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+]) -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" - fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- _LT_AC_TAGVAR(compiler, $1) \ -- _LT_AC_TAGVAR(CC, $1) \ -- _LT_AC_TAGVAR(LD, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -- _LT_AC_TAGVAR(old_archive_cmds, $1) \ -- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -- _LT_AC_TAGVAR(predep_objects, $1) \ -- _LT_AC_TAGVAR(postdep_objects, $1) \ -- _LT_AC_TAGVAR(predeps, $1) \ -- _LT_AC_TAGVAR(postdeps, $1) \ -- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -- _LT_AC_TAGVAR(archive_cmds, $1) \ -- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -- _LT_AC_TAGVAR(postinstall_cmds, $1) \ -- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -- _LT_AC_TAGVAR(no_undefined_flag, $1) \ -- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -- _LT_AC_TAGVAR(hardcode_automatic, $1) \ -- _LT_AC_TAGVAR(module_cmds, $1) \ -- _LT_AC_TAGVAR(module_expsym_cmds, $1) \ -- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -- _LT_AC_TAGVAR(exclude_expsyms, $1) \ -- _LT_AC_TAGVAR(include_expsyms, $1); do -+fi -+])# AC_LIBTOOL_CONFIG - -- case $var in -- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -- _LT_AC_TAGVAR(archive_cmds, $1) | \ -- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -- _LT_AC_TAGVAR(module_cmds, $1) | \ -- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done - -- case $lt_echo in -- *'\[$]0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -- ;; -- esac -+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - --ifelse([$1], [], -- [cfgfile="${ofile}T" -- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -- $rm -f "$cfgfile" -- AC_MSG_NOTICE([creating $ofile])], -- [cfgfile="$ofile"]) -+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -- cat <<__EOF__ >> "$cfgfile" --ifelse([$1], [], --[#! $SHELL -+if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - --# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. --# --# This file is part of GNU Libtool: --# Originally by Gordon Matzigkeit , 1996 --# --# 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. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# A sed program that does not truncate output. --SED=$lt_SED -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e 1s/^X//" -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- --# The names of the tagged configurations supported by this script. --available_tags= -- --# ### BEGIN LIBTOOL CONFIG], --[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -+fi -+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -+[AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([LT_AC_PROG_SED]) -+AC_REQUIRE([AC_PROG_NM]) -+AC_REQUIRE([AC_OBJEXT]) -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' - --# Whether or not to build static libraries. --build_old_libs=$enable_static -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+linux* | k*bsd*-gnu) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDGIRSTW]]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac - --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac - --# An echo program that does not interpret backslashes. --echo=$lt_echo -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do - --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" - --# A C compiler. --LTCC=$lt_LTCC -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -+ # Check to see that the pipe works correctly. -+ pipe_works=no - --# A language-specific compiler. --CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) -+ rm -f conftest* -+ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi - --# An ERE matcher. --EGREP=$lt_EGREP -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif - --# The linker used to build libraries. --LD=$lt_[]_LT_AC_TAGVAR(LD, $1) -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - --# Whether we need hard or soft links. --LN_S=$lt_LN_S -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif - --# A BSD-compatible nm program. --NM=$lt_NM -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[[]] = -+{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; - --# A symbol stripping program --STRIP=$lt_STRIP -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -f conftest* conftst* - --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -- --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -- --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -- --# Used on cygwin: assembler. --AS="$AS" -- --# The name of the directory that contains temporary libtool files. --objdir=$objdir -- --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -- --# How to pass a linker flag through the compiler. --wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -- --# Object file suffix (normally "o"). --objext="$ac_objext" -- --# Old archive suffix (normally "a"). --libext="$libext" -- --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -- --# Executable file suffix (normally ""). --exeext="$exeext" -- --# Additional compiler flags for building library objects. --pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) --pic_mode=$pic_mode -- --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -- --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -- --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -- --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -- --# Do we need a version for libraries? --need_version=$need_version -- --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -- --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -- --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -- --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) -- --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -- --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) -- --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) -- --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) -- --# Library versioning type. --version_type=$version_type -- --# Format of library name prefix. --libname_spec=$lt_libname_spec -- --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -- --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -- --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -- --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) -- --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) -- --# Commands used to build and install a shared archive. --archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) --archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -- --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) --module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) -- --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -- --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) -- --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -- --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -- --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) -- --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -- --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -- --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -- --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -- --# This is the shared library runtime path variable. --runpath_var=$runpath_var -- --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -- --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -- --# How to hardcode a shared library path into an executable. --hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) -- --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -- --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) -- --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) -- --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) -- --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -- --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) -- --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -- --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -- --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -- --# Set to yes if exported symbols are required. --always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - --# The commands to list exported symbols. --export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -+# --------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+ ifelse([$1],[CXX],[ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - --# Symbols that must always be exported. --include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) -- --ifelse([$1],[], --[# ### END LIBTOOL CONFIG], --[# ### END LIBTOOL TAG CONFIG: $tagname]) -- --__EOF__ -- --ifelse([$1],[], [ -- case $host_os in -- aix3*) -- cat <<\EOF >> "$cfgfile" -- --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --EOF -- ;; -- esac -- -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || \ -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" --]) --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi --fi --])# AC_LIBTOOL_CONFIG -- -- --# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) --# ------------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -- --_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -- --if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -- -- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -- lt_cv_prog_compiler_rtti_exceptions, -- [-fno-rtti -fno-exceptions], [], -- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) --fi --])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI -- -- --# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --# --------------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], --[AC_REQUIRE([AC_CANONICAL_HOST]) --AC_REQUIRE([AC_PROG_NM]) --AC_REQUIRE([AC_OBJEXT]) --# Check for command to grab the raw symbol name followed by C symbol from nm. --AC_MSG_CHECKING([command to parse $NM output from $compiler object]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], --[ --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -- --# Character class describing NM global symbol codes. --symcode='[[BCDEGRST]]' -- --# Regexp to match symbols that can be accessed directly from C. --sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -- --# Transform an extracted symbol line into a proper C declaration --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -- --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[[BCDT]]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[[ABCDGISTW]]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- if test "$host_cpu" = ia64; then -- symcode='[[ABCDEGRST]]' -- fi -- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- ;; --linux*) -- if test "$host_cpu" = ia64; then -- symcode='[[ABCDGIRSTW]]' -- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -- fi -- ;; --irix* | nonstopux*) -- symcode='[[BCDEGRST]]' -- ;; --osf*) -- symcode='[[BCDEGQRST]]' -- ;; --solaris*) -- symcode='[[BDRT]]' -- ;; --sco3.2v5*) -- symcode='[[DT]]' -- ;; --sysv4.2uw2*) -- symcode='[[DT]]' -- ;; --sysv5* | sco5v6* | unixware* | OpenUNIX*) -- symcode='[[ABDT]]' -- ;; --sysv4) -- symcode='[[DFNSTU]]' -- ;; --esac -- --# Handle CRLF in mingw tool chain --opt_cr= --case $build_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac -- --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- symcode='[[ABCDGIRSTW]]' ;; --esac -- --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -- -- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -- symxfrm="\\1 $ac_symprfx\\2 \\2" -- -- # Write the raw and C identifiers. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -- -- # Check to see that the pipe works correctly. -- pipe_works=no -- -- rm -f conftest* -- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -- -- # Make sure that we snagged all the symbols we need. -- if grep ' nm_test_var$' "$nlist" >/dev/null; then -- if grep ' nm_test_func$' "$nlist" >/dev/null; then -- cat < conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -- --EOF -- # Now generate the symbol file. -- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' -- -- cat <> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr_t void * --#else --# define lt_ptr_t char * --# define const --#endif -- --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr_t address; --} --lt_preloaded_symbols[[]] = --{ --EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr_t) 0} --}; -- --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -- pipe_works=yes -- fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -- cat conftest.$ac_ext >&5 -- fi -- rm -f conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done --]) --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- lt_cv_sys_global_symbol_to_cdecl= --fi --if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- AC_MSG_RESULT(failed) --else -- AC_MSG_RESULT(ok) --fi --]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -- -- --# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) --# --------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], --[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= -- --AC_MSG_CHECKING([for $compiler option to produce PIC]) -- ifelse([$1],[CXX],[ -- # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) -@@ -7100,12 +5405,14 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) -@@ -7117,7 +5424,7 @@ - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -- interix3*) -+ interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -7183,7 +5490,7 @@ - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) -@@ -7226,7 +5533,7 @@ - ;; - esac - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler -@@ -7253,6 +5560,14 @@ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -7269,7 +5584,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -7351,1466 +5666,3549 @@ - ;; - esac - fi --], --[ -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ newsos6) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ solaris*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ unicos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ -+ uts4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+]) -+ -+ -+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -+# ------------------------------------ -+# See if the linker supports building shared libraries. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ifelse([$1],[CXX],[ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix4* | aix5*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; -+ cygwin* | mingw*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+],[ -+ runpath_var= -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)= -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no -+ _LT_AC_TAGVAR(module_cmds, $1)= -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_AC_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ interix[[3-9]]*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ # see comment about different semantics on the GNU ld section -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ bsdi[[45]]*) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ freebsd1*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ newsos6) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ os2*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ solaris*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4.3*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_AC_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; -+esac -+])# AC_LIBTOOL_PROG_LD_SHLIBS -+ -+ -+# _LT_AC_FILE_LTDLL_C -+# ------------------- -+# Be careful that the start marker always follows a newline. -+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -+# /* ltdll.c starts here */ -+# #define WIN32_LEAN_AND_MEAN -+# #include -+# #undef WIN32_LEAN_AND_MEAN -+# #include -+# -+# #ifndef __CYGWIN__ -+# # ifdef __CYGWIN32__ -+# # define __CYGWIN__ __CYGWIN32__ -+# # endif -+# #endif -+# -+# #ifdef __cplusplus -+# extern "C" { -+# #endif -+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -+# #ifdef __cplusplus -+# } -+# #endif -+# -+# #ifdef __CYGWIN__ -+# #include -+# DECLARE_CYGWIN_DLL( DllMain ); -+# #endif -+# HINSTANCE __hDllInstance_base; -+# -+# BOOL APIENTRY -+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -+# { -+# __hDllInstance_base = hInst; -+# return TRUE; -+# } -+# /* ltdll.c ends here */ -+])# _LT_AC_FILE_LTDLL_C -+ -+ -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+ -+ -+# old names -+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+ -+# This is just to silence aclocal about the macro not being used -+ifelse([AC_DISABLE_FAST_INSTALL]) -+ -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) -+ -+AC_DEFUN([LT_AC_PROG_RC], -+[AC_CHECK_TOOL(RC, windres, no) -+]) -+ -+ -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. -+ -+# _AS_TEST_PREPARE -+# ---------------- -+m4_ifndef([_AS_TEST_PREPARE], -+[m4_defun([_AS_TEST_PREPARE], -+[if test -x / >/dev/null 2>&1; then -+ as_executable_p='test -x' -+else -+ as_executable_p='test -f' -+fi -+])])# _AS_TEST_PREPARE -+ -+# AS_EXECUTABLE_P -+# --------------- -+# Check whether a file is executable. -+m4_ifndef([AS_EXECUTABLE_P], -+[m4_defun([AS_EXECUTABLE_P], -+[AS_REQUIRE([_AS_TEST_PREPARE])dnl -+$as_executable_p $1[]dnl -+])])# AS_EXECUTABLE_P -+ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_SED. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+IFS=$as_save_IFS -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+]) -+ -+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -+AC_DEFUN([GNOME_DOC_DEFINES], -+[ -+AC_ARG_WITH([help-dir], -+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, -+ [with_help_dir='${datadir}/gnome/help']) -+HELP_DIR="$with_help_dir" -+AC_SUBST(HELP_DIR) -+ -+AC_ARG_WITH([omf-dir], -+ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, -+ [with_omf_dir='${datadir}/omf']) -+OMF_DIR="$with_omf_dir" -+AC_SUBST(OMF_DIR) -+ -+AC_ARG_WITH([help-formats], -+ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, -+ [with_help_formats='']) -+DOC_USER_FORMATS="$with_help_formats" -+AC_SUBST(DOC_USER_FORMATS) -+ -+AC_ARG_ENABLE([scrollkeeper], -+ [AC_HELP_STRING([--disable-scrollkeeper], -+ [do not make updates to the scrollkeeper database])],, -+ enable_scrollkeeper=yes) -+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) -+ -+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -+]) -+ -+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -+# -+AC_DEFUN([GNOME_DOC_INIT], -+[ -+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) -+ -+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], -+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) -+ -+if test "$gdu_cv_have_gdu" = "yes"; then -+ ifelse([$2],,[:],[$2]) -+else -+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -+fi -+ -+GNOME_DOC_DEFINES -+]) -+ -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant . -+# -+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ else -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) -+ fi -+else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT -+])], -+ [AC_MSG_RESULT([no]) -+ $4]) -+elif test $pkg_failed = untried; then -+ ifelse([$4], , [AC_MSG_FAILURE(dnl -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])], -+ [$4]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES -+ -+# Do all the work for Automake. -*- Autoconf -*- -+ -+# This macro actually does too much some checks are only needed if -+# your package does certain things. But this isn't really a big deal. -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 10 -+ -+AC_PREREQ([2.54]) -+ -+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -+# the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+ -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+ AC_REQUIRE([AC_PROG_INSTALL])dnl -+# test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+fi -+ -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) -+ -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_MISSING_PROG(AMTAR, tar) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+ -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+]) -+]) -+ -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $1 | $1:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright 2002 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+ -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION so it can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+ [AM_AUTOMAKE_VERSION([1.7.9])]) -+ -+# Helper functions for option handling. -*- Autoconf -*- -+ -+# Copyright 2001, 2002 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 2 -+ -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -+ -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ -+# -+# Check to make sure that the build environment is sane. -+# -+ -+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 3 -+ -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+AC_MSG_RESULT(yes)]) -+ -+# -*- Autoconf -*- -+ -+ -+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 3 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) -+fi -+]) -+ -+# AM_AUX_DIR_EXPAND -+ -+# Copyright 2001 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. -+# -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir -+# -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. -+# -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. -+ -+# Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50]) -+ -+AC_DEFUN([AM_AUX_DIR_EXPAND], [ -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+ -+# Copyright 2001 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"$am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) -+ -+# AM_PROG_INSTALL_STRIP -+ -+# Copyright 2001 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+ -+# -*- Autoconf -*- -+# Copyright (C) 2003 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 1 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) -+ -+# serial 5 -*- Autoconf -*- -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+ -+# 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+ -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+ -+ -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl -+ -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) -+ -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ : > sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break - fi - ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done - -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_$1_dependencies_compiler_type=none -+fi -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -+]) - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; - -- mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -- ;; -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+]) - -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -- ;; - -- interix3*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking Speeds up one-time builds -+ --enable-dependency-tracking Do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH]) -+]) - -- msdosdjgpp*) -- # Just because we use GCC doesn't mean we suddenly get shared libraries -- # on systems that don't support them. -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- enable_shared=no -- ;; -+# Generate code to set up dependency tracking. -*- Autoconf -*- - -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -- fi -- ;; -+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- ;; -+# 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, or (at your option) -+# any later version. - -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- ;; -- esac -- ;; -+# 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. - -- mingw* | pw32* | os2*) -- # This hack is so that the source file can tell whether it is being -- # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -- ;; -+# 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. - -- hpux9* | hpux10* | hpux11*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- ;; -+#serial 2 - -- irix5* | irix6* | nonstopux*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC (with -KPIC) is the default. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue -+ # Extract the definition of DEP_FILES from the Makefile without -+ # running `make'. -+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n -e '/^U = / s///p' < "$mf"` -+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -+ # We invoke sed twice because it is the simplest approach to -+ # changing $(DEPDIR) to its actual value in the expansion. -+ for file in `sed -n -e ' -+ /^DEP_FILES = .*\\\\$/ { -+ s/^DEP_FILES = // -+ :loop -+ s/\\\\$// -+ p -+ n -+ /\\\\$/ b loop -+ p -+ } -+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS - -- newsos6) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; - -- linux*) -- case $cc_basename in -- icc* | ecc*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- ccc*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All Alpha code is PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- esac -- ;; -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+]) - -- osf3* | osf4* | osf5*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All OSF/1 code is PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# Check to see how 'make' treats includes. -*- Autoconf -*- - -- solaris*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- case $cc_basename in -- f77* | f90* | f95*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -- esac -- ;; -+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -- sunos4*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# 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, or (at your option) -+# any later version. - -- sysv4 | sysv4.2uw2* | sysv4.3*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# 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. - -- sysv4*MP*) -- if test -d /usr/nec ;then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -+# 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. - -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# serial 2 - -- unicos*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU -+fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi -+fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf -+]) - -- uts4*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -- esac -- fi --]) --AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) -+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - --# --# Check to make sure the PIC flag actually works. --# --if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -- "" | " "*) ;; -- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -- esac], -- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" -- ;; --esac -+# 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, or (at your option) -+# any later version. - --# --# Check to make sure the static flag actually works. --# --wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" --AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -- $lt_tmp_static_flag, -- [], -- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) --]) -+# 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. - --# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) --# ------------------------------------ --# See if the linker supports building shared libraries. --AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], --[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) --ifelse([$1],[CXX],[ -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- case $host_os in -- aix4* | aix5*) -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- else -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- fi -- ;; -- pw32*) -- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -- cygwin* | mingw*) -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -- *) -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -- esac --],[ -- runpath_var= -- _LT_AC_TAGVAR(allow_undefined_flag, $1)= -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)= -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -- _LT_AC_TAGVAR(hardcode_automatic, $1)=no -- _LT_AC_TAGVAR(module_cmds, $1)= -- _LT_AC_TAGVAR(module_expsym_cmds, $1)= -- _LT_AC_TAGVAR(always_export_symbols, $1)=no -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- # include_expsyms should be a list of space-separated symbols to be *always* -- # included in the symbol list -- _LT_AC_TAGVAR(include_expsyms, $1)= -- # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -- # platforms (ab)use it in PIC code, but their linkers get confused if -- # the symbol is explicitly referenced. Since portable code cannot -- # rely on this symbol name, it's probably fine to never include it in -- # preloaded symbol tables. -- extract_expsyms_cmds= -- # Just being paranoid about ensuring that cc_basename is set. -- _LT_CC_BASENAME([$compiler]) -- case $host_os in -- cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -- ;; -- interix*) -- # we just hope/assume this is gcc and not c89 (= MSVC++) -- with_gnu_ld=yes -- ;; -- openbsd*) -- with_gnu_ld=no -- ;; -- esac -+AC_PREREQ([2.52]) -+ -+# serial 6 - -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -- # Set some defaults for GNU ld with shared library support. These -- # are reset later if shared libraries are not supported. Putting them -- # here allows them to be overridden if necessary. -- runpath_var=LD_RUN_PATH -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac -+# Add --enable-maintainer-mode option to configure. -+# From Jim Meyering - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix3* | aix4* | aix5*) -- # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <&2 -+# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+# 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, or (at your option) -+# any later version. - --EOF -- fi -- ;; -+# 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. - -- amigaos*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+# 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. - -- # Samuel A. Falvo II reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can't use -- # them. -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -+# serial 2 - -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Joseph Beckenbach says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+AC_DEFUN([AM_MAINTAINER_MODE], -+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode is disabled by default -+ AC_ARG_ENABLE(maintainer-mode, -+[ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ USE_MAINTAINER_MODE=$enableval, -+ USE_MAINTAINER_MODE=no) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST(MAINT)dnl -+] -+) - -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(always_export_symbols, $1)=no -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; - -- interix3*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- ;; -+# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -- linux*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- tmp_addflag= -- case $cc_basename,$host_cpu in -- pgcc*) # Portland Group C compiler -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag' -- ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -- tmp_addflag=' -i_dynamic' ;; -- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -- tmp_addflag=' -i_dynamic -nofor_main' ;; -- ifc* | ifort*) # Intel Fortran compiler -- tmp_addflag=' -nofor_main' ;; -- esac -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+# 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, or (at your option) -+# any later version. - -- if test $supports_anon_versioning = yes; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# 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. - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+# 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 3 -+ -+AC_PREREQ(2.50) -+ -+# AM_PROG_LEX -+# ----------- -+# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a -+# "missing" invocation, for better error output. -+AC_DEFUN([AM_PROG_LEX], -+[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -+AC_REQUIRE([AC_PROG_LEX])dnl -+if test "$LEX" = :; then -+ LEX=${am_missing_run}flex -+fi]) -+ -+ -+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -+# serial 36 IT_PROG_INTLTOOL -+AC_DEFUN([IT_PROG_INTLTOOL], -+[AC_PREREQ([2.50])dnl -+ -+case "$am__api_version" in -+ 1.[01234]) -+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) -+ ;; -+ *) -+ ;; -+esac -+ -+if test -n "$1"; then -+ AC_MSG_CHECKING([for intltool >= $1]) -+ -+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` -+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` -+ ] -+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -+fi -+ -+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' -+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ -+AC_SUBST(INTLTOOL_DESKTOP_RULE) -+AC_SUBST(INTLTOOL_DIRECTORY_RULE) -+AC_SUBST(INTLTOOL_KEYS_RULE) -+AC_SUBST(INTLTOOL_PROP_RULE) -+AC_SUBST(INTLTOOL_OAF_RULE) -+AC_SUBST(INTLTOOL_PONG_RULE) -+AC_SUBST(INTLTOOL_SERVER_RULE) -+AC_SUBST(INTLTOOL_SHEET_RULE) -+AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -+AC_SUBST(INTLTOOL_UI_RULE) -+AC_SUBST(INTLTOOL_XAM_RULE) -+AC_SUBST(INTLTOOL_KBD_RULE) -+AC_SUBST(INTLTOOL_XML_RULE) -+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -+AC_SUBST(INTLTOOL_CAVES_RULE) -+AC_SUBST(INTLTOOL_SCHEMAS_RULE) -+AC_SUBST(INTLTOOL_THEME_RULE) -+AC_SUBST(INTLTOOL_SERVICE_RULE) -+AC_SUBST(INTLTOOL_POLICY_RULE) -+ -+# Use the tools built into the package, not the ones that are installed. -+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') -+ -+AC_PATH_PROG(INTLTOOL_PERL, perl) -+if test -z "$INTLTOOL_PERL"; then -+ AC_MSG_ERROR([perl not found; required for intltool]) -+fi -+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then -+ AC_MSG_ERROR([perl 5.x required for intltool]) -+fi -+if test "x$2" != "xno-xml"; then -+ AC_MSG_CHECKING([for XML::Parser]) -+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -+ AC_MSG_RESULT([ok]) -+ else -+ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ fi -+fi - -- solaris*) -- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <&2 -+# Substitute ALL_LINGUAS so we can use it in po/Makefile -+AC_SUBST(ALL_LINGUAS) - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+# Set DATADIRNAME correctly if it is not set yet -+# (copied from glib-gettext.m4) -+if test -z "$DATADIRNAME"; then -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[]], -+ [[extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr]])], -+ [DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share -+ dnl in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [DATADIRNAME=share], [DATADIRNAME=lib]) -+ ;; -+ *) -+ [DATADIRNAME=lib] -+ ;; -+ esac]) -+fi -+AC_SUBST(DATADIRNAME) - --EOF -- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+IT_PO_SUBDIR([po]) - -- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -- case `$LD -v 2>&1` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <<_LT_EOF 1>&2 -+dnl The following is very similar to -+dnl -+dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) -+dnl -+dnl with the following slight differences: -+dnl - the *.in files are in ac_aux_dir, -+dnl - if the file haven't changed upon reconfigure, it's not touched, -+dnl - the evaluation of the third parameter enables a hack which computes -+dnl the actual value of $libdir, -+dnl - the user sees "executing intltool commands", instead of -+dnl "creating intltool-extract" and such. -+dnl -+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -+dnl a reason for it. - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not --*** reliably create shared libraries on SCO systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.16.91.0.3 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+AC_CONFIG_COMMANDS([intltool], [ - --_LT_EOF -- ;; -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -+for file in intltool-extract intltool-merge intltool-update; do -+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ -+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ -+ < ${ac_aux_dir}/${file}.in > ${file}.out -+ if cmp -s ${file} ${file}.out 2>/dev/null; then -+ rm -f ${file}.out -+ else -+ mv -f ${file}.out ${file} -+ fi -+ chmod ugo+x ${file} -+ chmod u+w ${file} -+done - -- sunos4*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+], -+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) - -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -+]) - -- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -- runpath_var= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ -+# IT_PO_SUBDIR(DIRNAME) -+# --------------------- -+# All po subdirs have to be declared with this macro; the subdir "po" is -+# declared by IT_PROG_INTLTOOL. -+# -+AC_DEFUN([IT_PO_SUBDIR], -+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -+dnl -+dnl The following CONFIG_COMMANDS should be exetuted at the very end -+dnl of config.status. -+AC_CONFIG_COMMANDS_PRE([ -+ AC_CONFIG_COMMANDS([$1/stamp-it], [ -+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" -+ >"$1/stamp-it.tmp" -+ [sed '/^#/d -+ s/^[[].*] *// -+ /^[ ]*$/d -+ '"s|^| $ac_top_srcdir/|" \ -+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" -+ ] -+ if test ! -f "$1/Makefile"; then -+ AC_MSG_ERROR([$1/Makefile is not ready.]) - fi -- else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- fi -- ;; -+ mv "$1/Makefile" "$1/Makefile.tmp" -+ [sed '/^POTFILES =/,/[^\\]$/ { -+ /^POTFILES =/!d -+ r $1/POTFILES -+ } -+ ' "$1/Makefile.tmp" >"$1/Makefile"] -+ rm -f "$1/Makefile.tmp" -+ mv "$1/stamp-it.tmp" "$1/stamp-it" -+ ]) -+])dnl -+]) - -- aix4* | aix5*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- else -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- fi -- aix_use_runtimelinking=no - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- ;; -- esac -+# deprecated macros -+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -+# A hint is needed for aclocal from Automake <= 1.9.4: -+# AC_DEFUN([AC_PROG_INTLTOOL], ...) - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+# Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003,2004 Red Hat, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995, 1996 -+# -+# Modified to never use included libintl. -+# Owen Taylor , 12/15/1998 -+# -+# Major rework to remove unused code -+# Owen Taylor , 12/11/2002 -+# -+# Added better handling of ALL_LINGUAS from GNU gettext version -+# written by Bruno Haible, Owen Taylor 5/30/3002 -+# -+# Modified to require ngettext -+# Matthias Clasen 08/06/2004 -+# -+# We need this here as well, since someone might use autoconf-2.5x -+# to configure GLib then an older version to configure a package -+# using AM_GLIB_GNU_GETTEXT -+AC_PREREQ(2.53) - -- _LT_AC_TAGVAR(archive_cmds, $1)='' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+dnl -+dnl We go to great lengths to make sure that aclocal won't -+dnl try to pull in the installed version of these macros -+dnl when running aclocal in the glib directory. -+dnl -+m4_copy([AC_DEFUN],[glib_DEFUN]) -+m4_copy([AC_REQUIRE],[glib_REQUIRE]) -+dnl -+dnl At the end, if we're not within glib, we'll define the public -+dnl definitions in terms of our private definitions. -+dnl - -- if test "$GCC" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- else -- # We have old collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+# GLIB_LC_MESSAGES -+#-------------------- -+glib_DEFUN([GLIB_LC_MESSAGES], -+ [AC_CHECK_HEADERS([locale.h]) -+ if test $ac_cv_header_locale_h = yes; then -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+ fi]) - -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -+# GLIB_PATH_PROG_WITH_TEST -+#---------------------------- -+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" -+ break - fi -- ;; -+ fi -+ done -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -+ AC_MSG_RESULT([$]$1) -+else -+ AC_MSG_RESULT(no) -+fi -+AC_SUBST($1)dnl -+]) - -- amigaos*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- # see comment about different semantics on the GNU ld section -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -+# GLIB_WITH_NLS -+#----------------- -+glib_DEFUN([GLIB_WITH_NLS], -+ dnl NLS is obligatory -+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ USE_NLS=yes -+ AC_SUBST(USE_NLS) - -- bsdi[[45]]*) -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -- ;; -+ gt_cv_have_gettext=no - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' -- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- ;; -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= - -- darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- if test "$GCC" = yes ; then -- output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- case $cc_basename in -- xlc*) -- output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- ;; -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi -- ;; -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" - -- dgux*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ # -+ # First check in libc -+ # -+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return !ngettext ("","", 1)], -+ gt_cv_func_ngettext_libc=yes, -+ gt_cv_func_ngettext_libc=no) -+ ]) -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return !dgettext ("","")], -+ gt_cv_func_dgettext_libc=yes, -+ gt_cv_func_dgettext_libc=no) -+ ]) -+ fi -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ fi - -- freebsd1*) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$gt_cv_func_ngettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+ -+ AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CHECK_LIB(intl, ngettext, -+ [AC_CHECK_LIB(intl, dgettext, -+ gt_cv_func_dgettext_libintl=yes)])]) - -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ AC_MSG_CHECKING([if -liconv is needed to use gettext]) -+ AC_MSG_RESULT([]) -+ AC_CHECK_LIB(intl, ngettext, -+ [AC_CHECK_LIB(intl, dcgettext, -+ [gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv], -+ :,-liconv)], -+ :,-liconv) -+ fi - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext and ngettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ LIBS="$glib_save_LIBS" - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ && test "$gt_cv_func_ngettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi -+ fi - -- hpux9*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes - fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ AC_DEFINE(HAVE_GETTEXT,1, -+ [Define if the GNU gettext() function is already present or preinstalled.]) -+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" -+ AC_CHECK_FUNCS(dcgettext) -+ MSGFMT_OPTS= -+ AC_MSG_CHECKING([if msgfmt accepts -c]) -+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -+msgid "" -+msgstr "" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Project-Id-Version: test 1.0\n" -+"PO-Revision-Date: 2007-02-15 12:01+0100\n" -+"Last-Translator: test \n" -+"Language-Team: C \n" -+"MIME-Version: 1.0\n" -+"Content-Transfer-Encoding: 8bit\n" -+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) -+ AC_SUBST(MSGFMT_OPTS) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr], -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share and -+ dnl and CATOBJEXT=.gmo in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [CATOBJEXT=.mo -+ DATADIRNAME=lib]) -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac]) -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi -+ ]) - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [always defined to indicate that i18n is enabled]) -+ fi - -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is not GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; - else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" - fi -- if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ fi - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- fi -- ;; -+ # We need to process the po/ directory. -+ POSUB=po - -- hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- fi -- if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) - -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ dnl These rules are solely for the distribution goal. While doing this -+ dnl we only have to keep exactly one list of the available catalogs -+ dnl in configure.in. -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- ;; -- esac -- fi -- ;; -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(CATALOGS) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(DATADIRNAME) -+ AC_SUBST(GMOFILES) -+ AC_SUBST(INSTOBJEXT) -+ AC_SUBST(INTLLIBS) -+ AC_SUBST(PO_IN_DATADIR_TRUE) -+ AC_SUBST(PO_IN_DATADIR_FALSE) -+ AC_SUBST(POFILES) -+ AC_SUBST(POSUB) -+ ]) - -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- ;; -+# AM_GLIB_GNU_GETTEXT -+# ------------------- -+# Do checks necessary for use of gettext. If a suitable implementation -+# of gettext is found in either in libintl or in the C library, -+# it will set INTLLIBS to the libraries needed for use of gettext -+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -+# on various variables needed by the Makefile.in.in installed by -+# glib-gettextize. -+dnl -+glib_DEFUN([GLIB_GNU_GETTEXT], -+ [AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ -+ GLIB_LC_MESSAGES -+ GLIB_WITH_NLS - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ AC_MSG_CHECKING(for catalogs to be installed) -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ AC_MSG_RESULT($LINGUAS) -+ fi - -- newsos6) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi - -- openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -- fi -- ;; -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) - -- os2*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) - -- osf3*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+glib_save_datarootdir="$datarootdir" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+datarootdir=`eval echo "${datarootdir}"` -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` -+else -+ localedir=`eval echo "${datadir}/locale"` -+fi -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+datarootdir="$glib_save_datarootdir" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- else -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl - -- # Both c and cxx compiler support -rpath directly -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -+# -+# Create a temporary file with TEST-FILE as its contents and pass the -+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -+# 0 and perform ACTION-IF-FAIL for any other exit status. -+AC_DEFUN([GLIB_RUN_PROG], -+[cat >conftest.foo <<_ACEOF -+$2 -+_ACEOF -+if AC_RUN_LOG([$1 conftest.foo]); then -+ m4_ifval([$3], [$3], [:]) -+m4_ifvaln([$4], [else $4])dnl -+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -+fi]) - -- solaris*) -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -- else -- wlarc='' -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -- # Supported since Solaris 2.6 (maybe 2.5.1?) -- case $wlarc in -- '') -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; -- *) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -- esac -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- ;; - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Configure paths for GLIB -+# Owen Taylor 1997-2001 - -- sysv4) -- case $host_vendor in -- sni) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -- ;; -- siemens) -- ## LD is ld it makes a PLAMLIB -- ## CC just makes a GrossModule. -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- ;; -- motorola) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -- ;; -+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -+dnl gthread is specified in MODULES, pass to pkg-config -+dnl -+AC_DEFUN([AM_PATH_GLIB_2_0], -+[dnl -+dnl Get the cflags and libraries from pkg-config -+dnl -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) -+ -+ pkg_config_args=glib-2.0 -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ pkg_config_args="$pkg_config_args gmodule-2.0" -+ ;; -+ gmodule-no-export) -+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" -+ ;; -+ gobject) -+ pkg_config_args="$pkg_config_args gobject-2.0" -+ ;; -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; - esac -- runpath_var='LD_RUN_PATH' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ done - -- sysv4.3*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -- ;; -+ PKG_PROG_PKG_CONFIG([0.16]) - -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- fi -- ;; -+ no_glib="" - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) -- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var='LD_RUN_PATH' -+ if test "x$PKG_CONFIG" = x ; then -+ no_glib=yes -+ PKG_CONFIG=no -+ fi - -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+ min_glib_version=ifelse([$1], ,2.0.0,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -+ enable_glibtest=no -+ fi - -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -+ : -+ else -+ no_glib=yes -+ fi -+ fi - -- uts4*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+ if test x"$no_glib" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi --]) --AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent) -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include -+#include -+#include - --# --# Do we need to explicitly link libc? --# --case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in --x|xyes) -- # Assume -lc should be added -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; - -- if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $_LT_AC_TAGVAR(archive_cmds, $1) in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -- $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ system ("touch conf.glibtest"); - -- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)= -- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -- then -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- else -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- fi -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $rm conftest* -- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -- ;; -- esac -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GLIB or finding the wrong" -+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) - fi -- ;; --esac --])# AC_LIBTOOL_PROG_LD_SHLIBS -- -- --# _LT_AC_FILE_LTDLL_C --# ------------------- --# Be careful that the start marker always follows a newline. --AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include --# #undef WIN32_LEAN_AND_MEAN --# #include --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ --])# _LT_AC_FILE_LTDLL_C -- -- --# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) --# --------------------------------- --AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -- -- --# old names --AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) --AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) --AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) --AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) --AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) --AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) --AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -- --# This is just to silence aclocal about the macro not being used --ifelse([AC_DISABLE_FAST_INSTALL]) -- --AC_DEFUN([LT_AC_PROG_GCJ], --[AC_CHECK_TOOL(GCJ, gcj, no) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -- AC_SUBST(GCJFLAGS) -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest - ]) - --AC_DEFUN([LT_AC_PROG_RC], --[AC_CHECK_TOOL(RC, windres, no) --]) -+dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS -+dnl -+AC_DEFUN([AM_PATH_ORBIT2], -+[dnl -+dnl Get the cflags and libraries from the orbit2-config script -+dnl -+AC_ARG_WITH(orbit-prefix,[ --with-orbit-prefix=PFX Prefix where ORBIT is installed (optional)], -+ orbit_config_prefix="$withval", orbit_config_prefix="") -+AC_ARG_WITH(orbit-exec-prefix,[ --with-orbit-exec-prefix=PFX Exec prefix where ORBIT is installed (optional)], -+ orbit_config_exec_prefix="$withval", orbit_config_exec_prefix="") -+AC_ARG_ENABLE(orbittest, [ --disable-orbittest Do not try to compile and run a test ORBIT program], -+ , enable_orbittest=yes) - --# NOTE: This macro has been submitted for inclusion into # --# GNU Autoconf as AC_PROG_SED. When it is available in # --# a released version of Autoconf we should remove this # --# macro and use it instead. # --# LT_AC_PROG_SED --# -------------- --# Check for a fully-functional sed program, that truncates --# as few characters as possible. Prefer GNU sed if found. --AC_DEFUN([LT_AC_PROG_SED], --[AC_MSG_CHECKING([for a sed that does not truncate output]) --AC_CACHE_VAL(lt_cv_path_SED, --[# Loop through the user's path and test for sed and gsed. --# Then use that list of sed's as ones to test for truncation. --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for lt_ac_prog in sed gsed; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -- fi -- done -+ for module in . $4 -+ do -+ case "$module" in -+ server) -+ orbit_config_args="$orbit_config_args server" -+ ;; -+ client) -+ orbit_config_args="$orbit_config_args client" -+ ;; -+ esac - done --done --lt_ac_max=0 --lt_ac_count=0 --# Add /usr/xpg4/bin/sed as it is typically found on Solaris --# along with /bin/sed that truncates output. --for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && continue -- cat /dev/null > conftest.in -- lt_ac_count=0 -- echo $ECHO_N "0123456789$ECHO_C" >conftest.in -- # Check for GNU sed and select it if it is found. -- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -- lt_cv_path_SED=$lt_ac_sed -- break -+ if test x$orbit_config_args = x ; then -+ orbit_config_args=server - fi -- while true; do -- cat conftest.in conftest.in >conftest.tmp -- mv conftest.tmp conftest.in -- cp conftest.in conftest.nl -- echo >>conftest.nl -- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -- cmp -s conftest.out conftest.nl || break -- # 10000 chars as input seems more than enough -- test $lt_ac_count -gt 10 && break -- lt_ac_count=`expr $lt_ac_count + 1` -- if test $lt_ac_count -gt $lt_ac_max; then -- lt_ac_max=$lt_ac_count -- lt_cv_path_SED=$lt_ac_sed -- fi -- done --done --]) --SED=$lt_cv_path_SED --AC_MSG_RESULT([$SED]) --]) -- --# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- --# --# Copyright © 2004 Scott James Remnant . --# --# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# PKG_PROG_PKG_CONFIG([MIN-VERSION]) --# ---------------------------------- --AC_DEFUN([PKG_PROG_PKG_CONFIG], --[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) --m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) --AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl --if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) --fi --if test -n "$PKG_CONFIG"; then -- _pkg_min_version=m4_default([$1], [0.9.0]) -- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- PKG_CONFIG="" -- fi -- --fi[]dnl --])# PKG_PROG_PKG_CONFIG -- --# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) --# --# Check to see whether a particular set of modules exists. Similar --# to PKG_CHECK_MODULES(), but does not set variables or print errors. --# --# --# Similar to PKG_CHECK_MODULES, make sure that the first instance of --# this or PKG_CHECK_MODULES is called, or make sure to call --# PKG_CHECK_EXISTS manually --# -------------------------------------------------------------- --AC_DEFUN([PKG_CHECK_EXISTS], --[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl --if test -n "$PKG_CONFIG" && \ -- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -- m4_ifval([$2], [$2], [:]) --m4_ifvaln([$3], [else -- $3])dnl --fi]) - -+ if test x$orbit_config_exec_prefix != x ; then -+ orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix" -+ if test x${ORBIT_CONFIG+set} != xset ; then -+ ORBIT_CONFIG=$orbit_config_exec_prefix/bin/orbit2-config -+ fi -+ fi -+ if test x$orbit_config_prefix != x ; then -+ orbit_config_args="$orbit_config_args --prefix=$orbit_config_prefix" -+ if test x${ORBIT_CONFIG+set} != xset ; then -+ ORBIT_CONFIG=$orbit_config_prefix/bin/orbit2-config -+ fi -+ fi - --# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) --# --------------------------------------------- --m4_define([_PKG_CONFIG], --[if test -n "$PKG_CONFIG"; then -- if test -n "$$1"; then -- pkg_cv_[]$1="$$1" -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no) -+ min_orbit_version=ifelse([$1], , 2.3.0, $1) -+ AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version) -+ no_orbit="" -+ if test "$ORBIT_CONFIG" = "no" ; then -+ if test "$PKG_CONFIG" = "no" ; then -+ no_orbit=yes - else -- PKG_CHECK_EXISTS([$3], -- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -- [pkg_failed=yes]) -+ ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0` -+ ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0` - fi --else -- pkg_failed=untried --fi[]dnl --])# _PKG_CONFIG -+ else -+ ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags` -+ ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs` -+ fi - --# _PKG_SHORT_ERRORS_SUPPORTED --# ----------------------------- --AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], --[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi[]dnl --])# _PKG_SHORT_ERRORS_SUPPORTED -+ if test "x$no_orbit" = x ; then -+ ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0` - -+ orbit_config_major_version=`echo $ORBIT_VERSION | \ -+ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ orbit_config_minor_version=`echo $ORBIT_VERSION | \ -+ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ orbit_config_micro_version=`echo $ORBIT_VERSION | \ -+ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_orbittest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $ORBIT_CFLAGS" -+ LIBS="$ORBIT_LIBS $LIBS" -+dnl -+dnl Now check if the installed ORBIT is sufficiently new. (Also sanity -+dnl checks the results of orbit2-config to some extent -+dnl -+ rm -f conf.orbittest -+ AC_TRY_RUN([ -+#include -+#include -+#include - --# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], --# [ACTION-IF-NOT-FOUND]) --# --# --# Note that if there is a possibility the first call to --# PKG_CHECK_MODULES might not happen, you should be sure to include an --# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac --# --# --# -------------------------------------------------------------- --AC_DEFUN([PKG_CHECK_MODULES], --[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl --AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl --AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; - --pkg_failed=no --AC_MSG_CHECKING([for $1]) -+ system ("touch conf.orbittest"); - --_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) --_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_orbit_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_orbit_version"); -+ exit(1); -+ } - --m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS --and $1[]_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details.]) -+ if ((orbit_major_version != $orbit_config_major_version) || -+ (orbit_minor_version != $orbit_config_minor_version) || -+ (orbit_micro_version != $orbit_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --version ORBit-2.0' returned %d.%d.%d, but ORBit (%d.%d.%d)\n", -+ $orbit_config_major_version, $orbit_config_minor_version, $orbit_config_micro_version, -+ orbit_major_version, orbit_minor_version, orbit_micro_version); -+ printf ("*** was found! If orbit2-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of ORBit. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If orbit2-config was wrong, set the environment variable ORBIT_CONFIG\n"); -+ printf("*** to point to the correct copy of orbit2-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (ORBIT_MAJOR_VERSION) && defined (ORBIT_MINOR_VERSION) && defined (ORBIT_MICRO_VERSION) -+ else if ((orbit_major_version != ORBIT_MAJOR_VERSION) || -+ (orbit_minor_version != ORBIT_MINOR_VERSION) || -+ (orbit_micro_version != ORBIT_MICRO_VERSION)) -+ { -+ printf("*** ORBit header files (version %d.%d.%d) do not match\n", -+ ORBIT_MAJOR_VERSION, ORBIT_MINOR_VERSION, ORBIT_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ orbit_major_version, orbit_minor_version, orbit_micro_version); -+ } -+#endif /* defined (ORBIT_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((orbit_major_version > major) || -+ ((orbit_major_version == major) && (orbit_minor_version > minor)) || -+ ((orbit_major_version == major) && (orbit_minor_version == minor) && (orbit_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of ORBit (%d.%d.%d) was found.\n", -+ orbit_major_version, orbit_minor_version, orbit_micro_version); -+ printf("*** You need a version of ORBit newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** ORBit is always available from ftp://ftp.orbit.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the orbit2-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of ORBit, but you can also set the ORBIT_CONFIG environment to point to the\n"); -+ printf("*** correct copy of orbit2-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_orbit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_orbit" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$ORBIT_CONFIG" = "no" ; then -+ echo "*** The orbit2-config script installed by ORBIT could not be found" -+ echo "*** If ORBit was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the ORBIT_CONFIG environment variable to the" -+ echo "*** full path to orbit2-config." -+ else -+ if test -f conf.orbittest ; then -+ : -+ else -+ echo "*** Could not run ORBIT test program, checking why..." -+ CFLAGS="$CFLAGS $ORBIT_CFLAGS" -+ LIBS="$LIBS $ORBIT_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((orbit_major_version) || (orbit_minor_version) || (orbit_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding ORBit or finding the wrong" -+ echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the ORBit package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps orbit orbit-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means ORBIT was incorrectly installed" -+ echo "*** or that you have moved ORBit since it was installed. In the latter case, you" -+ echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ ORBIT_CFLAGS="" -+ ORBIT_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi - --if test $pkg_failed = yes; then -- _PKG_SHORT_ERRORS_SUPPORTED -- if test $_pkg_short_errors_supported = yes; then -- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -- else -- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, ifelse([$3], , :, [$3])) -+ AC_SUBST(ORBIT_CFLAGS) -+ AC_SUBST(ORBIT_LIBS) -+ AC_SUBST(ORBIT_IDL) -+ rm -f conf.orbittest -+]) - -- ifelse([$4], , [AC_MSG_ERROR(dnl --[Package requirements ($2) were not met: -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl - --$$1_PKG_ERRORS -+AC_DEFUN([AM_GCONF_SOURCE_2], -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+ AC_ARG_WITH(gconf-source, -+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - --_PKG_TEXT --])], -- [$4]) --elif test $pkg_failed = untried; then -- ifelse([$4], , [AC_MSG_FAILURE(dnl --[The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - --_PKG_TEXT -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ fi - --To get pkg-config, see .])], -- [$4]) --else -- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -- AC_MSG_RESULT([yes]) -- ifelse([$3], , :, [$3]) --fi[]dnl --])# PKG_CHECK_MODULES -+ AC_ARG_WITH(gconf-schema-file-dir, -+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ -+ AC_ARG_ENABLE(schemas-install, -+ [ --disable-schemas-install Disable the schemas installation], -+ [case ${enableval} in -+ yes|no) ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; -+ esac]) -+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -+]) - --m4_include([acinclude.m4]) -diff -ruN evolution-2.12.2.orig/aclocal.m4~ evolution-2.12.2/aclocal.m4~ ---- evolution-2.12.2.orig/aclocal.m4~ 1970-01-01 01:00:00.000000000 +0100 -+++ evolution-2.12.2/aclocal.m4~ 2007-11-26 04:31:44.000000000 +0100 -@@ -0,0 +1,8816 @@ -+# generated automatically by aclocal 1.10 -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+m4_if(m4_PACKAGE_VERSION, [2.61],, -+[m4_fatal([this file was generated for autoconf 2.61. -+You have another version of autoconf. If you want to use that, -+you should regenerate the build system entirely.], [63])]) -+ -+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.10' -+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -+dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.10], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+]) -+ -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+[AM_AUTOMAKE_VERSION([1.10])dnl -+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+ -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. -+# -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir -+# -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. -+# -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. -+ -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) -+ -+# AM_CONDITIONAL -*- Autoconf -*- -+ -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 8 -+ -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' -+else -+ $1_TRUE='#' -+ $1_FALSE= -+fi -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 9 -+ -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+ -+ -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl -+ -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) -+ -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_$1_dependencies_compiler_type=none -+fi -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -+]) -+ -+ -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+]) -+ -+ -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+]) -+ -+# Generate code to set up dependency tracking. -*- Autoconf -*- -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+#serial 3 -+ -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS -+ -+ -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+]) -+ -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 8 -+ -+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -+ -+# Do all the work for Automake. -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 12 -+ -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. -+ -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.60])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi -+fi -+ -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) -+ -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -+]) -+]) -+ -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $1 | $1:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) -+ -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) -+ -+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 5 -+ -+# AM_PROG_LEX -+# ----------- -+# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a -+# "missing" invocation, for better error output. -+AC_DEFUN([AM_PROG_LEX], -+[AC_PREREQ(2.50)dnl -+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -+AC_REQUIRE([AC_PROG_LEX])dnl -+if test "$LEX" = :; then -+ LEX=${am_missing_run}flex -+fi]) -+ -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -+# From Jim Meyering -+ -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+AC_DEFUN([AM_MAINTAINER_MODE], -+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode is disabled by default -+ AC_ARG_ENABLE(maintainer-mode, -+[ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ USE_MAINTAINER_MODE=$enableval, -+ USE_MAINTAINER_MODE=no) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST(MAINT)dnl -+] -+) -+ -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+ -+# Check to see how 'make' treats includes. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU -+fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi -+fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf -+]) -+ -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -+ -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 5 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([missing])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) -+fi -+]) -+ -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_MKDIR_P -+# --------------- -+# Check for `mkdir -p'. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+]) -+ -+# Helper functions for option handling. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -+ -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_RUN_LOG(COMMAND) -+# ------------------- -+# Run COMMAND, save the exit status in ac_status, and log it. -+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -+AC_DEFUN([AM_RUN_LOG], -+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD -+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ (exit $ac_status); }]) -+ -+# Check to make sure that the build environment is sane. -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+AC_MSG_RESULT(yes)]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_STRIP -+# --------------------- -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+ -+# Copyright (C) 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) -+ -+# Check how to create a tarball. -*- Autoconf -*- -+ -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac -+ -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break -+ -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir -+ -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR -+ -+dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS -+dnl -+AC_DEFUN([AM_PATH_ORBIT2], -+[dnl -+dnl Get the cflags and libraries from the orbit2-config script -+dnl -+AC_ARG_WITH(orbit-prefix,[ --with-orbit-prefix=PFX Prefix where ORBIT is installed (optional)], -+ orbit_config_prefix="$withval", orbit_config_prefix="") -+AC_ARG_WITH(orbit-exec-prefix,[ --with-orbit-exec-prefix=PFX Exec prefix where ORBIT is installed (optional)], -+ orbit_config_exec_prefix="$withval", orbit_config_exec_prefix="") -+AC_ARG_ENABLE(orbittest, [ --disable-orbittest Do not try to compile and run a test ORBIT program], -+ , enable_orbittest=yes) -+ -+ for module in . $4 -+ do -+ case "$module" in -+ server) -+ orbit_config_args="$orbit_config_args server" -+ ;; -+ client) -+ orbit_config_args="$orbit_config_args client" -+ ;; -+ esac -+ done -+ if test x$orbit_config_args = x ; then -+ orbit_config_args=server -+ fi -+ -+ if test x$orbit_config_exec_prefix != x ; then -+ orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix" -+ if test x${ORBIT_CONFIG+set} != xset ; then -+ ORBIT_CONFIG=$orbit_config_exec_prefix/bin/orbit2-config -+ fi -+ fi -+ if test x$orbit_config_prefix != x ; then -+ orbit_config_args="$orbit_config_args --prefix=$orbit_config_prefix" -+ if test x${ORBIT_CONFIG+set} != xset ; then -+ ORBIT_CONFIG=$orbit_config_prefix/bin/orbit2-config -+ fi -+ fi -+ -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no) -+ min_orbit_version=ifelse([$1], , 2.3.0, $1) -+ AC_MSG_CHECKING(for ORBit - version >= $min_orbit_version) -+ no_orbit="" -+ if test "$ORBIT_CONFIG" = "no" ; then -+ if test "$PKG_CONFIG" = "no" ; then -+ no_orbit=yes -+ else -+ ORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-2.0` -+ ORBIT_LIBS=`$PKG_CONFIG --libs ORBit-2.0` -+ fi -+ else -+ ORBIT_CFLAGS=`$ORBIT_CONFIG $orbit_config_args --cflags` -+ ORBIT_LIBS=`$ORBIT_CONFIG $orbit_config_args --libs` -+ fi -+ -+ if test "x$no_orbit" = x ; then -+ ORBIT_VERSION=`$PKG_CONFIG --modversion ORBit-2.0` -+ -+ orbit_config_major_version=`echo $ORBIT_VERSION | \ -+ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ orbit_config_minor_version=`echo $ORBIT_VERSION | \ -+ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ orbit_config_micro_version=`echo $ORBIT_VERSION | \ -+ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_orbittest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $ORBIT_CFLAGS" -+ LIBS="$ORBIT_LIBS $LIBS" -+dnl -+dnl Now check if the installed ORBIT is sufficiently new. (Also sanity -+dnl checks the results of orbit2-config to some extent -+dnl -+ rm -f conf.orbittest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.orbittest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_orbit_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_orbit_version"); -+ exit(1); -+ } -+ -+ if ((orbit_major_version != $orbit_config_major_version) || -+ (orbit_minor_version != $orbit_config_minor_version) || -+ (orbit_micro_version != $orbit_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --version ORBit-2.0' returned %d.%d.%d, but ORBit (%d.%d.%d)\n", -+ $orbit_config_major_version, $orbit_config_minor_version, $orbit_config_micro_version, -+ orbit_major_version, orbit_minor_version, orbit_micro_version); -+ printf ("*** was found! If orbit2-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of ORBit. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If orbit2-config was wrong, set the environment variable ORBIT_CONFIG\n"); -+ printf("*** to point to the correct copy of orbit2-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (ORBIT_MAJOR_VERSION) && defined (ORBIT_MINOR_VERSION) && defined (ORBIT_MICRO_VERSION) -+ else if ((orbit_major_version != ORBIT_MAJOR_VERSION) || -+ (orbit_minor_version != ORBIT_MINOR_VERSION) || -+ (orbit_micro_version != ORBIT_MICRO_VERSION)) -+ { -+ printf("*** ORBit header files (version %d.%d.%d) do not match\n", -+ ORBIT_MAJOR_VERSION, ORBIT_MINOR_VERSION, ORBIT_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ orbit_major_version, orbit_minor_version, orbit_micro_version); -+ } -+#endif /* defined (ORBIT_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((orbit_major_version > major) || -+ ((orbit_major_version == major) && (orbit_minor_version > minor)) || -+ ((orbit_major_version == major) && (orbit_minor_version == minor) && (orbit_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of ORBit (%d.%d.%d) was found.\n", -+ orbit_major_version, orbit_minor_version, orbit_micro_version); -+ printf("*** You need a version of ORBit newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** ORBit is always available from ftp://ftp.orbit.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the orbit2-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of ORBit, but you can also set the ORBIT_CONFIG environment to point to the\n"); -+ printf("*** correct copy of orbit2-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_orbit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_orbit" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$ORBIT_CONFIG" = "no" ; then -+ echo "*** The orbit2-config script installed by ORBIT could not be found" -+ echo "*** If ORBit was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the ORBIT_CONFIG environment variable to the" -+ echo "*** full path to orbit2-config." -+ else -+ if test -f conf.orbittest ; then -+ : -+ else -+ echo "*** Could not run ORBIT test program, checking why..." -+ CFLAGS="$CFLAGS $ORBIT_CFLAGS" -+ LIBS="$LIBS $ORBIT_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((orbit_major_version) || (orbit_minor_version) || (orbit_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding ORBit or finding the wrong" -+ echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the ORBit package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps orbit orbit-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means ORBIT was incorrectly installed" -+ echo "*** or that you have moved ORBit since it was installed. In the latter case, you" -+ echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ ORBIT_CFLAGS="" -+ ORBIT_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ -+ AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, ifelse([$3], , :, [$3])) -+ AC_SUBST(ORBIT_CFLAGS) -+ AC_SUBST(ORBIT_LIBS) -+ AC_SUBST(ORBIT_IDL) -+ rm -f conf.orbittest -+]) -+ -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl -+ -+AC_DEFUN([AM_GCONF_SOURCE_2], -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi -+ -+ AC_ARG_WITH(gconf-source, -+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ fi -+ -+ AC_ARG_WITH(gconf-schema-file-dir, -+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) -+ -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ -+ AC_ARG_ENABLE(schemas-install, -+ [ --disable-schemas-install Disable the schemas installation], -+ [case ${enableval} in -+ yes|no) ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; -+ esac]) -+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -+]) -+ -+# Configure paths for GLIB -+# Owen Taylor 1997-2001 -+ -+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -+dnl gthread is specified in MODULES, pass to pkg-config -+dnl -+AC_DEFUN([AM_PATH_GLIB_2_0], -+[dnl -+dnl Get the cflags and libraries from pkg-config -+dnl -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) -+ -+ pkg_config_args=glib-2.0 -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ pkg_config_args="$pkg_config_args gmodule-2.0" -+ ;; -+ gmodule-no-export) -+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" -+ ;; -+ gobject) -+ pkg_config_args="$pkg_config_args gobject-2.0" -+ ;; -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ PKG_PROG_PKG_CONFIG([0.16]) -+ -+ no_glib="" -+ -+ if test "x$PKG_CONFIG" = x ; then -+ no_glib=yes -+ PKG_CONFIG=no -+ fi -+ -+ min_glib_version=ifelse([$1], ,2.0.0,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -+ -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -+ enable_glibtest=no -+ fi -+ -+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -+ : -+ else -+ no_glib=yes -+ fi -+ fi -+ -+ if test x"$no_glib" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+ -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent) -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.glibtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GLIB or finding the wrong" -+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest -+]) -+ -+# Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003,2004 Red Hat, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995, 1996 -+# -+# Modified to never use included libintl. -+# Owen Taylor , 12/15/1998 -+# -+# Major rework to remove unused code -+# Owen Taylor , 12/11/2002 -+# -+# Added better handling of ALL_LINGUAS from GNU gettext version -+# written by Bruno Haible, Owen Taylor 5/30/3002 -+# -+# Modified to require ngettext -+# Matthias Clasen 08/06/2004 -+# -+# We need this here as well, since someone might use autoconf-2.5x -+# to configure GLib then an older version to configure a package -+# using AM_GLIB_GNU_GETTEXT -+AC_PREREQ(2.53) -+ -+dnl -+dnl We go to great lengths to make sure that aclocal won't -+dnl try to pull in the installed version of these macros -+dnl when running aclocal in the glib directory. -+dnl -+m4_copy([AC_DEFUN],[glib_DEFUN]) -+m4_copy([AC_REQUIRE],[glib_REQUIRE]) -+dnl -+dnl At the end, if we're not within glib, we'll define the public -+dnl definitions in terms of our private definitions. -+dnl -+ -+# GLIB_LC_MESSAGES -+#-------------------- -+glib_DEFUN([GLIB_LC_MESSAGES], -+ [AC_CHECK_HEADERS([locale.h]) -+ if test $ac_cv_header_locale_h = yes; then -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+ fi]) -+ -+# GLIB_PATH_PROG_WITH_TEST -+#---------------------------- -+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -+ AC_MSG_RESULT([$]$1) -+else -+ AC_MSG_RESULT(no) -+fi -+AC_SUBST($1)dnl -+]) -+ -+# GLIB_WITH_NLS -+#----------------- -+glib_DEFUN([GLIB_WITH_NLS], -+ dnl NLS is obligatory -+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ USE_NLS=yes -+ AC_SUBST(USE_NLS) -+ -+ gt_cv_have_gettext=no -+ -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= -+ -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" -+ -+ # -+ # First check in libc -+ # -+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return !ngettext ("","", 1)], -+ gt_cv_func_ngettext_libc=yes, -+ gt_cv_func_ngettext_libc=no) -+ ]) -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return !dgettext ("","")], -+ gt_cv_func_dgettext_libc=yes, -+ gt_cv_func_dgettext_libc=no) -+ ]) -+ fi -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ fi -+ -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$gt_cv_func_ngettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+ -+ AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CHECK_LIB(intl, ngettext, -+ [AC_CHECK_LIB(intl, dgettext, -+ gt_cv_func_dgettext_libintl=yes)])]) -+ -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ AC_MSG_CHECKING([if -liconv is needed to use gettext]) -+ AC_MSG_RESULT([]) -+ AC_CHECK_LIB(intl, ngettext, -+ [AC_CHECK_LIB(intl, dcgettext, -+ [gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv], -+ :,-liconv)], -+ :,-liconv) -+ fi -+ -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext and ngettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ LIBS="$glib_save_LIBS" -+ -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ && test "$gt_cv_func_ngettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi -+ fi -+ -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes -+ fi -+ -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ AC_DEFINE(HAVE_GETTEXT,1, -+ [Define if the GNU gettext() function is already present or preinstalled.]) -+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" -+ AC_CHECK_FUNCS(dcgettext) -+ MSGFMT_OPTS= -+ AC_MSG_CHECKING([if msgfmt accepts -c]) -+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -+msgid "" -+msgstr "" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Project-Id-Version: test 1.0\n" -+"PO-Revision-Date: 2007-02-15 12:01+0100\n" -+"Last-Translator: test \n" -+"Language-Team: C \n" -+"MIME-Version: 1.0\n" -+"Content-Transfer-Encoding: 8bit\n" -+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) -+ AC_SUBST(MSGFMT_OPTS) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr], -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share and -+ dnl and CATOBJEXT=.gmo in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [CATOBJEXT=.mo -+ DATADIRNAME=lib]) -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac]) -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi -+ ]) -+ -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [always defined to indicate that i18n is enabled]) -+ fi -+ -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is not GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" -+ fi -+ fi -+ -+ # We need to process the po/ directory. -+ POSUB=po -+ -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) -+ -+ dnl These rules are solely for the distribution goal. While doing this -+ dnl we only have to keep exactly one list of the available catalogs -+ dnl in configure.in. -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(CATALOGS) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(DATADIRNAME) -+ AC_SUBST(GMOFILES) -+ AC_SUBST(INSTOBJEXT) -+ AC_SUBST(INTLLIBS) -+ AC_SUBST(PO_IN_DATADIR_TRUE) -+ AC_SUBST(PO_IN_DATADIR_FALSE) -+ AC_SUBST(POFILES) -+ AC_SUBST(POSUB) -+ ]) -+ -+# AM_GLIB_GNU_GETTEXT -+# ------------------- -+# Do checks necessary for use of gettext. If a suitable implementation -+# of gettext is found in either in libintl or in the C library, -+# it will set INTLLIBS to the libraries needed for use of gettext -+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -+# on various variables needed by the Makefile.in.in installed by -+# glib-gettextize. -+dnl -+glib_DEFUN([GLIB_GNU_GETTEXT], -+ [AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ -+ GLIB_LC_MESSAGES -+ GLIB_WITH_NLS -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ AC_MSG_CHECKING(for catalogs to be installed) -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ AC_MSG_RESULT($LINGUAS) -+ fi -+ -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) -+ -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) -+ -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+glib_save_datarootdir="$datarootdir" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+datarootdir=`eval echo "${datarootdir}"` -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` -+else -+ localedir=`eval echo "${datadir}/locale"` -+fi -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+datarootdir="$glib_save_datarootdir" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) -+ -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl -+ -+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -+# -+# Create a temporary file with TEST-FILE as its contents and pass the -+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -+# 0 and perform ACTION-IF-FAIL for any other exit status. -+AC_DEFUN([GLIB_RUN_PROG], -+[cat >conftest.foo <<_ACEOF -+$2 -+_ACEOF -+if AC_RUN_LOG([$1 conftest.foo]); then -+ m4_ifval([$3], [$3], [:]) -+m4_ifvaln([$4], [else $4])dnl -+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -+fi]) -+ -+ -+dnl GNOME_COMPILE_WARNINGS -+dnl Turn on many useful compiler warnings -+dnl For now, only works on GCC -+AC_DEFUN([GNOME_COMPILE_WARNINGS],[ -+ dnl ****************************** -+ dnl More compiler warnings -+ dnl ****************************** -+ -+ AC_ARG_ENABLE(compile-warnings, -+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], -+ [Turn on compiler warnings]),, -+ [enable_compile_warnings="m4_default([$1],[yes])"]) -+ -+ warnCFLAGS= -+ if test "x$GCC" != xyes; then -+ enable_compile_warnings=no -+ fi -+ -+ warning_flags= -+ realsave_CFLAGS="$CFLAGS" -+ -+ case "$enable_compile_warnings" in -+ no) -+ warning_flags= -+ ;; -+ minimum) -+ warning_flags="-Wall" -+ ;; -+ yes) -+ warning_flags="-Wall -Wmissing-prototypes" -+ ;; -+ maximum|error) -+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" -+ CFLAGS="$warning_flags $CFLAGS" -+ for option in -Wno-sign-compare; do -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $option" -+ AC_MSG_CHECKING([whether gcc understands $option]) -+ AC_TRY_COMPILE([], [], -+ has_option=yes, -+ has_option=no,) -+ CFLAGS="$SAVE_CFLAGS" -+ AC_MSG_RESULT($has_option) -+ if test $has_option = yes; then -+ warning_flags="$warning_flags $option" -+ fi -+ unset has_option -+ unset SAVE_CFLAGS -+ done -+ unset option -+ if test "$enable_compile_warnings" = "error" ; then -+ warning_flags="$warning_flags -Werror" -+ fi -+ ;; -+ *) -+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) -+ ;; -+ esac -+ CFLAGS="$realsave_CFLAGS" -+ AC_MSG_CHECKING(what warning flags to pass to the C compiler) -+ AC_MSG_RESULT($warning_flags) -+ -+ AC_ARG_ENABLE(iso-c, -+ AC_HELP_STRING([--enable-iso-c], -+ [Try to warn if code is not ISO C ]),, -+ [enable_iso_c=no]) -+ -+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) -+ complCFLAGS= -+ if test "x$enable_iso_c" != "xno"; then -+ if test "x$GCC" = "xyes"; then -+ case " $CFLAGS " in -+ *[\ \ ]-ansi[\ \ ]*) ;; -+ *) complCFLAGS="$complCFLAGS -ansi" ;; -+ esac -+ case " $CFLAGS " in -+ *[\ \ ]-pedantic[\ \ ]*) ;; -+ *) complCFLAGS="$complCFLAGS -pedantic" ;; -+ esac -+ fi -+ fi -+ AC_MSG_RESULT($complCFLAGS) -+ -+ WARN_CFLAGS="$warning_flags $complCFLAGS" -+ AC_SUBST(WARN_CFLAGS) -+]) -+ -+dnl For C++, do basically the same thing. -+ -+AC_DEFUN([GNOME_CXX_WARNINGS],[ -+ AC_ARG_ENABLE(cxx-warnings, -+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] -+ [Turn on compiler warnings.]),, -+ [enable_cxx_warnings="m4_default([$1],[minimum])"]) -+ -+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) -+ warnCXXFLAGS= -+ if test "x$GXX" != xyes; then -+ enable_cxx_warnings=no -+ fi -+ if test "x$enable_cxx_warnings" != "xno"; then -+ if test "x$GXX" = "xyes"; then -+ case " $CXXFLAGS " in -+ *[\ \ ]-Wall[\ \ ]*) ;; -+ *) warnCXXFLAGS="-Wall -Wno-unused" ;; -+ esac -+ -+ ## -W is not all that useful. And it cannot be controlled -+ ## with individual -Wno-xxx flags, unlike -Wall -+ if test "x$enable_cxx_warnings" = "xyes"; then -+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" -+ fi -+ fi -+ fi -+ AC_MSG_RESULT($warnCXXFLAGS) -+ -+ AC_ARG_ENABLE(iso-cxx, -+ AC_HELP_STRING([--enable-iso-cxx], -+ [Try to warn if code is not ISO C++ ]),, -+ [enable_iso_cxx=no]) -+ -+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) -+ complCXXFLAGS= -+ if test "x$enable_iso_cxx" != "xno"; then -+ if test "x$GXX" = "xyes"; then -+ case " $CXXFLAGS " in -+ *[\ \ ]-ansi[\ \ ]*) ;; -+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; -+ esac -+ -+ case " $CXXFLAGS " in -+ *[\ \ ]-pedantic[\ \ ]*) ;; -+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; -+ esac -+ fi -+ fi -+ AC_MSG_RESULT($complCXXFLAGS) -+ -+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" -+ AC_SUBST(WARN_CXXFLAGS) -+]) -+ -+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -+AC_DEFUN([GNOME_DOC_DEFINES], -+[ -+AC_ARG_WITH([help-dir], -+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, -+ [with_help_dir='${datadir}/gnome/help']) -+HELP_DIR="$with_help_dir" -+AC_SUBST(HELP_DIR) -+ -+AC_ARG_WITH([omf-dir], -+ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, -+ [with_omf_dir='${datadir}/omf']) -+OMF_DIR="$with_omf_dir" -+AC_SUBST(OMF_DIR) -+ -+AC_ARG_WITH([help-formats], -+ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, -+ [with_help_formats='']) -+DOC_USER_FORMATS="$with_help_formats" -+AC_SUBST(DOC_USER_FORMATS) -+ -+AC_ARG_ENABLE([scrollkeeper], -+ [AC_HELP_STRING([--disable-scrollkeeper], -+ [do not make updates to the scrollkeeper database])],, -+ enable_scrollkeeper=yes) -+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) -+ -+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -+]) -+ -+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -+# -+AC_DEFUN([GNOME_DOC_INIT], -+[ -+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) -+ -+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], -+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) -+ -+if test "$gdu_cv_have_gdu" = "yes"; then -+ ifelse([$2],,[:],[$2]) -+else -+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -+fi -+ -+GNOME_DOC_DEFINES -+]) -+ -+ -+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -+# serial 36 IT_PROG_INTLTOOL -+AC_DEFUN([IT_PROG_INTLTOOL], -+[AC_PREREQ([2.50])dnl -+ -+case "$am__api_version" in -+ 1.[01234]) -+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) -+ ;; -+ *) -+ ;; -+esac -+ -+if test -n "$1"; then -+ AC_MSG_CHECKING([for intltool >= $1]) -+ -+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` -+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` -+ ] -+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -+fi -+ -+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' -+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ -+AC_SUBST(INTLTOOL_DESKTOP_RULE) -+AC_SUBST(INTLTOOL_DIRECTORY_RULE) -+AC_SUBST(INTLTOOL_KEYS_RULE) -+AC_SUBST(INTLTOOL_PROP_RULE) -+AC_SUBST(INTLTOOL_OAF_RULE) -+AC_SUBST(INTLTOOL_PONG_RULE) -+AC_SUBST(INTLTOOL_SERVER_RULE) -+AC_SUBST(INTLTOOL_SHEET_RULE) -+AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -+AC_SUBST(INTLTOOL_UI_RULE) -+AC_SUBST(INTLTOOL_XAM_RULE) -+AC_SUBST(INTLTOOL_KBD_RULE) -+AC_SUBST(INTLTOOL_XML_RULE) -+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -+AC_SUBST(INTLTOOL_CAVES_RULE) -+AC_SUBST(INTLTOOL_SCHEMAS_RULE) -+AC_SUBST(INTLTOOL_THEME_RULE) -+AC_SUBST(INTLTOOL_SERVICE_RULE) -+AC_SUBST(INTLTOOL_POLICY_RULE) -+ -+# Check the gettext tools to make sure they are GNU -+AC_PATH_PROG(XGETTEXT, xgettext) -+AC_PATH_PROG(MSGMERGE, msgmerge) -+AC_PATH_PROG(MSGFMT, msgfmt) -+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -+fi -+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -+fi -+ -+# Use the tools built into the package, not the ones that are installed. -+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') -+ -+AC_PATH_PROG(INTLTOOL_PERL, perl) -+if test -z "$INTLTOOL_PERL"; then -+ AC_MSG_ERROR([perl not found; required for intltool]) -+fi -+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then -+ AC_MSG_ERROR([perl 5.x required for intltool]) -+fi -+if test "x$2" != "xno-xml"; then -+ AC_MSG_CHECKING([for XML::Parser]) -+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -+ AC_MSG_RESULT([ok]) -+ else -+ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ fi -+fi -+ -+# Substitute ALL_LINGUAS so we can use it in po/Makefile -+AC_SUBST(ALL_LINGUAS) -+ -+# Set DATADIRNAME correctly if it is not set yet -+# (copied from glib-gettext.m4) -+if test -z "$DATADIRNAME"; then -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[]], -+ [[extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr]])], -+ [DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share -+ dnl in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [DATADIRNAME=share], [DATADIRNAME=lib]) -+ ;; -+ *) -+ [DATADIRNAME=lib] -+ ;; -+ esac]) -+fi -+AC_SUBST(DATADIRNAME) -+ -+IT_PO_SUBDIR([po]) -+ -+dnl The following is very similar to -+dnl -+dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) -+dnl -+dnl with the following slight differences: -+dnl - the *.in files are in ac_aux_dir, -+dnl - if the file haven't changed upon reconfigure, it's not touched, -+dnl - the evaluation of the third parameter enables a hack which computes -+dnl the actual value of $libdir, -+dnl - the user sees "executing intltool commands", instead of -+dnl "creating intltool-extract" and such. -+dnl -+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -+dnl a reason for it. -+ -+AC_CONFIG_COMMANDS([intltool], [ -+ -+for file in intltool-extract intltool-merge intltool-update; do -+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ -+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ -+ < ${ac_aux_dir}/${file}.in > ${file}.out -+ if cmp -s ${file} ${file}.out 2>/dev/null; then -+ rm -f ${file}.out -+ else -+ mv -f ${file}.out ${file} -+ fi -+ chmod ugo+x ${file} -+ chmod u+w ${file} -+done -+ -+], -+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) -+ -+]) -+ -+ -+# IT_PO_SUBDIR(DIRNAME) -+# --------------------- -+# All po subdirs have to be declared with this macro; the subdir "po" is -+# declared by IT_PROG_INTLTOOL. -+# -+AC_DEFUN([IT_PO_SUBDIR], -+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -+dnl -+dnl The following CONFIG_COMMANDS should be exetuted at the very end -+dnl of config.status. -+AC_CONFIG_COMMANDS_PRE([ -+ AC_CONFIG_COMMANDS([$1/stamp-it], [ -+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" -+ >"$1/stamp-it.tmp" -+ [sed '/^#/d -+ s/^[[].*] *// -+ /^[ ]*$/d -+ '"s|^| $ac_top_srcdir/|" \ -+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" -+ ] -+ if test ! -f "$1/Makefile"; then -+ AC_MSG_ERROR([$1/Makefile is not ready.]) -+ fi -+ mv "$1/Makefile" "$1/Makefile.tmp" -+ [sed '/^POTFILES =/,/[^\\]$/ { -+ /^POTFILES =/!d -+ r $1/POTFILES -+ } -+ ' "$1/Makefile.tmp" >"$1/Makefile"] -+ rm -f "$1/Makefile.tmp" -+ mv "$1/stamp-it.tmp" "$1/stamp-it" -+ ]) -+])dnl -+]) -+ -+ -+# deprecated macros -+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -+# A hint is needed for aclocal from Automake <= 1.9.4: -+# AC_DEFUN([AC_PROG_INTLTOOL], ...) -+ -+ -+# isc-posix.m4 serial 2 (gettext-0.11.2) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -+ -+# This test replaces the one in autoconf. -+# Currently this macro should have the same name as the autoconf macro -+# because gettext's gettext.m4 (distributed in the automake package) -+# still uses it. Otherwise, the use in gettext.m4 makes autoheader -+# give these diagnostics: -+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -+ -+undefine([AC_ISC_POSIX]) -+ -+AC_DEFUN([AC_ISC_POSIX], -+ [ -+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -+ ] -+) -+ -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+ -+# serial 48 AC_PROG_LIBTOOL -+ -+ -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If this macro is not defined by Autoconf, define it here. -+m4_ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [m4_define([AC_PROVIDE_IFELSE], -+ [m4_ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) -+ -+ -+# AC_PROG_LIBTOOL -+# --------------- -+AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -+ AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [AC_LIBTOOL_CXX], -+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -+ ])]) -+dnl And a similar setup for Fortran 77 support -+ AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [AC_LIBTOOL_F77], -+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -+])]) -+ -+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -+ AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [ifdef([AC_PROG_GCJ], -+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([A][M_PROG_GCJ], -+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([LT_AC_PROG_GCJ], -+ [define([LT_AC_PROG_GCJ], -+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -+])])# AC_PROG_LIBTOOL -+ -+ -+# _AC_PROG_LIBTOOL -+# ---------------- -+AC_DEFUN([_AC_PROG_LIBTOOL], -+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -+ -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl -+ -+# Prevent multiple expansion -+define([AC_PROG_LIBTOOL], []) -+])# _AC_PROG_LIBTOOL -+ -+ -+# AC_LIBTOOL_SETUP -+# ---------------- -+AC_DEFUN([AC_LIBTOOL_SETUP], -+[AC_PREREQ(2.50)dnl -+AC_REQUIRE([AC_ENABLE_SHARED])dnl -+AC_REQUIRE([AC_ENABLE_STATIC])dnl -+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_LD])dnl -+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -+AC_REQUIRE([AC_PROG_NM])dnl -+ -+AC_REQUIRE([AC_PROG_LN_S])dnl -+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -+AC_REQUIRE([AC_OBJEXT])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+dnl -+ -+AC_LIBTOOL_SYS_MAX_CMD_LEN -+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+AC_LIBTOOL_OBJDIR -+ -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+_LT_AC_PROG_ECHO_BACKSLASH -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] -+ -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Constants: -+rm="rm -f" -+ -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+AC_CHECK_TOOL(AR, ar, false) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+ -+_LT_CC_BASENAME([$compiler]) -+ -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC -+ fi -+ ;; -+esac -+ -+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+enable_win32_dll=yes, enable_win32_dll=no) -+ -+AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+AC_ARG_WITH([pic], -+ [AC_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+test -z "$pic_mode" && pic_mode=default -+ -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP -+ -+ -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_AC_SYS_COMPILER -+ -+ -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) -+ -+ -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+ -+# _LT_AC_SYS_LIBPATH_AIX -+# ---------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'`; fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_AC_SYS_LIBPATH_AIX -+ -+ -+# _LT_AC_SHELL_INIT(ARG) -+# ---------------------- -+AC_DEFUN([_LT_AC_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_AC_SHELL_INIT -+ -+ -+# _LT_AC_PROG_ECHO_BACKSLASH -+# -------------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -+[_LT_AC_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac -+ -+echo=${ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -+fi -+ -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat </dev/null 2>&1 && unset CDPATH -+ -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done -+fi -+ -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. -+ -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: -+ -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi -+ fi -+ fi -+ fi -+fi -+fi -+ -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi -+ -+AC_SUBST(ECHO) -+])])# _LT_AC_PROG_ECHO_BACKSLASH -+ -+ -+# _LT_AC_LOCK -+# ----------- -+AC_DEFUN([_LT_AC_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) LD="${LD-ld} -64" ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+ ]) -+esac -+ -+need_locks="$enable_libtool_lock" -+ -+])# _LT_AC_LOCK -+ -+ -+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+]) -+ -+if test x"[$]$2" = xyes; then -+ ifelse([$5], , :, [$5]) -+else -+ ifelse([$6], , :, [$6]) -+fi -+])# AC_LIBTOOL_COMPILER_OPTION -+ -+ -+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ------------------------------------------------------------ -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -+[AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $rm conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) -+ -+if test x"[$]$2" = xyes; then -+ ifelse([$4], , :, [$4]) -+else -+ ifelse([$5], , :, [$5]) -+fi -+])# AC_LIBTOOL_LINKER_OPTION -+ -+ -+# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# -------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -+[# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+])# AC_LIBTOOL_SYS_MAX_CMD_LEN -+ -+ -+# _LT_AC_CHECK_DLFCN -+# ------------------ -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h)dnl -+])# _LT_AC_CHECK_DLFCN -+ -+ -+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# --------------------------------------------------------------------- -+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext < -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ exit (status); -+}] -+EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_AC_TRY_DLOPEN_SELF -+ -+ -+# AC_LIBTOOL_DLOPEN_SELF -+# ---------------------- -+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; -+ -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+])# AC_LIBTOOL_DLOPEN_SELF -+ -+ -+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -+# --------------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler -+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* -+]) -+])# AC_LIBTOOL_PROG_CC_C_O -+ -+ -+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -+# ----------------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -+[AC_REQUIRE([_LT_AC_LOCK])dnl -+ -+hard_links="nottested" -+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -+ -+ -+# AC_LIBTOOL_OBJDIR -+# ----------------- -+AC_DEFUN([AC_LIBTOOL_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR -+ -+ -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- -+# Check hardcoding attributes. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_AC_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existant directories. -+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -+ -+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH -+ -+ -+# AC_LIBTOOL_SYS_LIB_STRIP -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -+[striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+])# AC_LIBTOOL_SYS_LIB_STRIP -+ -+ -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_MSG_CHECKING([dynamic linker characteristics]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix4* | aix5*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -+ if test "$GCC" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -+ else -+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -+ fi -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+kfreebsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ freebsd*) # from 4.6 on -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390x*|powerpc64*) -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+knetbsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='GNU ld.so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+nto-qnx*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+ -+ -+# _LT_AC_TAGCONFIG -+# ---------------- -+AC_DEFUN([_LT_AC_TAGCONFIG], -+[AC_ARG_WITH([tags], -+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -+ [include additional configurations @<:@automatic@:>@])], -+ [tagnames="$withval"]) -+ -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ AC_MSG_WARN([output file `$ofile' does not exist]) -+ fi -+ -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -+ else -+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) -+ fi -+ fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi -+ -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -+ "") ;; -+ *) AC_MSG_ERROR([invalid tag name: $tagname]) -+ ;; -+ esac -+ -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ AC_MSG_ERROR([tag name \"$tagname\" already exists]) -+ fi -+ -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_LIBTOOL_LANG_CXX_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ AC_LIBTOOL_LANG_F77_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ AC_LIBTOOL_LANG_GCJ_CONFIG -+ else -+ tagname="" -+ fi -+ ;; -+ -+ RC) -+ AC_LIBTOOL_LANG_RC_CONFIG -+ ;; -+ -+ *) -+ AC_MSG_ERROR([Unsupported tag name: $tagname]) -+ ;; -+ esac -+ -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" -+ fi -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ AC_MSG_ERROR([unable to update list of available tagged configurations.]) -+ fi -+fi -+])# _LT_AC_TAGCONFIG -+ -+ -+# AC_LIBTOOL_DLOPEN -+# ----------------- -+# enable checks for dlopen support -+AC_DEFUN([AC_LIBTOOL_DLOPEN], -+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_DLOPEN -+ -+ -+# AC_LIBTOOL_WIN32_DLL -+# -------------------- -+# declare package support for building win32 DLLs -+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_WIN32_DLL -+ -+ -+# AC_ENABLE_SHARED([DEFAULT]) -+# --------------------------- -+# implement the --enable-shared flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_SHARED], -+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([shared], -+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -+])# AC_ENABLE_SHARED -+ -+ -+# AC_DISABLE_SHARED -+# ----------------- -+# set the default shared flag to --disable-shared -+AC_DEFUN([AC_DISABLE_SHARED], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_SHARED(no) -+])# AC_DISABLE_SHARED -+ -+ -+# AC_ENABLE_STATIC([DEFAULT]) -+# --------------------------- -+# implement the --enable-static flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_STATIC], -+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([static], -+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]AC_ENABLE_STATIC_DEFAULT) -+])# AC_ENABLE_STATIC -+ -+ -+# AC_DISABLE_STATIC -+# ----------------- -+# set the default static flag to --disable-static -+AC_DEFUN([AC_DISABLE_STATIC], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_STATIC(no) -+])# AC_DISABLE_STATIC -+ -+ -+# AC_ENABLE_FAST_INSTALL([DEFAULT]) -+# --------------------------------- -+# implement the --enable-fast-install flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_FAST_INSTALL], -+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([fast-install], -+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -+])# AC_ENABLE_FAST_INSTALL -+ -+ -+# AC_DISABLE_FAST_INSTALL -+# ----------------------- -+# set the default to --disable-fast-install -+AC_DEFUN([AC_DISABLE_FAST_INSTALL], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_FAST_INSTALL(no) -+])# AC_DISABLE_FAST_INSTALL -+ -+ -+# AC_LIBTOOL_PICMODE([MODE]) -+# -------------------------- -+# implement the --with-pic flag -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+AC_DEFUN([AC_LIBTOOL_PICMODE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+pic_mode=ifelse($#,1,$1,default) -+])# AC_LIBTOOL_PICMODE -+ -+ -+# AC_PROG_EGREP -+# ------------- -+# This is predefined starting with Autoconf 2.54, so this conditional -+# definition can be removed once we require Autoconf 2.54 or later. -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi]) -+ EGREP=$ac_cv_prog_egrep -+ AC_SUBST([EGREP]) -+])]) -+ -+ -+# AC_PATH_TOOL_PREFIX -+# ------------------- -+# find a file program which can recognise shared library -+AC_DEFUN([AC_PATH_TOOL_PREFIX], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="ifelse([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+])# AC_PATH_TOOL_PREFIX -+ -+ -+# AC_PATH_MAGIC -+# ------------- -+# find a file program which can recognise a shared library -+AC_DEFUN([AC_PATH_MAGIC], -+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ else -+ MAGIC_CMD=: -+ fi -+fi -+])# AC_PATH_MAGIC -+ -+ -+# AC_PROG_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([AC_PROG_LD], -+[AC_ARG_WITH([gnu-ld], -+ [AC_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no]) -+AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; -+ -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; -+ *) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ ;; -+ esac -+ ;; -+ -+interix3*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -+ fi -+ ;; -+ -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; -+ -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; -+ -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; -+ -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac -+]) -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown -+])# AC_DEPLIBS_CHECK_METHOD -+ -+ -+# AC_PROG_NM -+# ---------- -+# find the pathname to a BSD-compatible name lister -+AC_DEFUN([AC_PROG_NM], -+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done -+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+fi]) -+NM="$lt_cv_path_NM" -+])# AC_PROG_NM -+ -+ -+# AC_CHECK_LIBM -+# ------------- -+# check for math library -+AC_DEFUN([AC_CHECK_LIBM], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it -+ ;; -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ ;; -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") -+ ;; -+esac -+])# AC_CHECK_LIBM -+ -+ -+# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl convenience library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-convenience to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -+# (note the single quotes!). If your package is not flat and you're not -+# using automake, define top_builddir and top_srcdir appropriately in -+# the Makefiles. -+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ case $enable_ltdl_convenience in -+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -+ "") enable_ltdl_convenience=yes -+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -+ esac -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_CONVENIENCE -+ -+ -+# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl installable library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-install to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# and an installed libltdl is not found, it is assumed to be `libltdl'. -+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and top_srcdir -+# appropriately in the Makefiles. -+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ AC_CHECK_LIB(ltdl, lt_dlinit, -+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -+ [if test x"$enable_ltdl_install" = xno; then -+ AC_MSG_WARN([libltdl not installed, but installation disabled]) -+ else -+ enable_ltdl_install=yes -+ fi -+ ]) -+ if test x"$enable_ltdl_install" = x"yes"; then -+ ac_configure_args="$ac_configure_args --enable-ltdl-install" -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ else -+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -+ LIBLTDL="-lltdl" -+ LTDLINCL= -+ fi -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_INSTALLABLE -+ -+ -+# AC_LIBTOOL_CXX -+# -------------- -+# enable support for C++ libraries -+AC_DEFUN([AC_LIBTOOL_CXX], -+[AC_REQUIRE([_LT_AC_LANG_CXX]) -+])# AC_LIBTOOL_CXX -+ -+ -+# _LT_AC_LANG_CXX -+# --------------- -+AC_DEFUN([_LT_AC_LANG_CXX], -+[AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -+])# _LT_AC_LANG_CXX -+ -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+fi -+])# _LT_AC_PROG_CXXCPP -+ -+# AC_LIBTOOL_F77 -+# -------------- -+# enable support for Fortran 77 libraries -+AC_DEFUN([AC_LIBTOOL_F77], -+[AC_REQUIRE([_LT_AC_LANG_F77]) -+])# AC_LIBTOOL_F77 -+ -+ -+# _LT_AC_LANG_F77 -+# --------------- -+AC_DEFUN([_LT_AC_LANG_F77], -+[AC_REQUIRE([AC_PROG_F77]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -+])# _LT_AC_LANG_F77 -+ -+ -+# AC_LIBTOOL_GCJ -+# -------------- -+# enable support for GCJ libraries -+AC_DEFUN([AC_LIBTOOL_GCJ], -+[AC_REQUIRE([_LT_AC_LANG_GCJ]) -+])# AC_LIBTOOL_GCJ -+ -+ -+# _LT_AC_LANG_GCJ -+# --------------- -+AC_DEFUN([_LT_AC_LANG_GCJ], -+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -+])# _LT_AC_LANG_GCJ -+ -+ -+# AC_LIBTOOL_RC -+# ------------- -+# enable support for Windows resource files -+AC_DEFUN([AC_LIBTOOL_RC], -+[AC_REQUIRE([LT_AC_PROG_RC]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -+])# AC_LIBTOOL_RC -+ -+ -+# AC_LIBTOOL_LANG_C_CONFIG -+# ------------------------ -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -+AC_DEFUN([_LT_AC_LANG_C_CONFIG], -+[lt_save_CC="$CC" -+AC_LANG_PUSH(C) -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}\n' -+ -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF -+ -+# Report which library types will actually be built -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) -+ -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+esac -+AC_MSG_RESULT([$enable_shared]) -+ -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_C_CONFIG -+ -+ -+# AC_LIBTOOL_LANG_CXX_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -+[AC_LANG_PUSH(C++) -+AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+ -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Dependencies to place before and after the object being linked: -+_LT_AC_TAGVAR(predep_objects, $1)= -+_LT_AC_TAGVAR(postdep_objects, $1)= -+_LT_AC_TAGVAR(predeps, $1)= -+_LT_AC_TAGVAR(postdeps, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;\n" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+else -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+fi -+ -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ AC_PROG_LD -+ -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+fi -+ -+# PORTME: fill in a description of your system's C++ link characteristics -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+_LT_AC_TAGVAR(ld_shlibs, $1)=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ freebsd-elf*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ freebsd* | kfreebsd*-gnu | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ interix3*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ linux*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc*) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ esac -+ ;; -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The C++ compiler is used as linker so we must use $wl -+ # flag to pass the commands to the underlying system -+ # linker. We must also pass each convience library through -+ # to the system linker between allextract/defaultextract. -+ # The C++ compiler will combine linker options so we -+ # cannot just pass the convience library names through -+ # without $wl. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ fi -+ ;; -+ esac -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+esac -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+_LT_AC_TAGVAR(GCC, $1)="$GXX" -+_LT_AC_TAGVAR(LD, $1)="$LD" -+ -+AC_LIBTOOL_POSTDEP_PREDEP($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+])# AC_LIBTOOL_LANG_CXX_CONFIG -+ -+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -+# ------------------------------------ -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" -+ifelse([$1], [], -+[#! $SHELL -+ -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit , 1996 -+# -+# 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. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# A sed program that does not truncate output. -+SED=$lt_SED -+ -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e 1s/^X//" -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# The names of the tagged configurations supported by this script. -+available_tags= -+ -+# ### BEGIN LIBTOOL CONFIG], -+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) -+ -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) -+ -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A C compiler. -+LTCC=$lt_LTCC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ -+# A language-specific compiler. -+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) -+ -+# Is the compiler the GNU C compiler? -+with_gcc=$_LT_AC_TAGVAR(GCC, $1) -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# The linker used to build libraries. -+LD=$lt_[]_LT_AC_TAGVAR(LD, $1) -+ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S -+ -+# A BSD-compatible nm program. -+NM=$lt_NM -+ -+# A symbol stripping program -+STRIP=$lt_STRIP -+ -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" -+ -+# Used on cygwin: assembler. -+AS="$AS" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ -+# Object file suffix (normally "o"). -+objext="$ac_objext" -+ -+# Old archive suffix (normally "a"). -+libext="$libext" -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' -+ -+# Executable file suffix (normally ""). -+exeext="$exeext" -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+pic_mode=$pic_mode -+ -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -+ -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method -+ -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) -+ -+ifelse([$1],[], -+[# ### END LIBTOOL CONFIG], -+[# ### END LIBTOOL TAG CONFIG: $tagname]) -+ -+__EOF__ -+ -+ifelse([$1],[], [ -+ case $host_os in -+ aix3*) -+ cat <<\EOF >> "$cfgfile" -+ -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF -+ ;; -+ esac -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+]) -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi -+])# AC_LIBTOOL_CONFIG -+ -+ -+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+ -+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ -+if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -+fi -+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI -+ -+ -+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -+[AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([AC_PROG_NM]) -+AC_REQUIRE([AC_OBJEXT]) -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -+ -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+linux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDGIRSTW]]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac -+ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac -+ -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac -+ -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do -+ -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ -+ # Check to see that the pipe works correctly. -+ pipe_works=no -+ -+ rm -f conftest* -+ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi -+ -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' -+ -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif -+ -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[[]] = -+{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; -+ -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -f conftest* conftst* -+ -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+ -+ -+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -+# --------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= -+ -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+ ifelse([$1],[CXX],[ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | os2* | pw32*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ interix3*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix4* | aix5*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | kfreebsd*-gnu | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ fi -+ ;; -+ aCC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux*) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ icpc* | ecpc*) -+ # Intel C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler. -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd*) -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ -+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ -+ interix3*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; -+ -+ mingw* | pw32* | os2*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ newsos6) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ linux*) -+ case $cc_basename in -+ icc* | ecc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ esac -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ solaris*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ unicos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ -+ uts4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+]) -+ -+ -+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -+# ------------------------------------ -+# See if the linker supports building shared libraries. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ifelse([$1],[CXX],[ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix4* | aix5*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; -+ cygwin* | mingw*) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ *) -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+],[ -+ runpath_var= -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)= -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no -+ _LT_AC_TAGVAR(module_cmds, $1)= -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_AC_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix3* | aix4* | aix5*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+EOF -+ fi -+ ;; -+ -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ interix3*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; -+ -+ aix4* | aix5*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ # see comment about different semantics on the GNU ld section -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ bsdi[[45]]*) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; -+ -+ dgux*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ freebsd1*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | kfreebsd*-gnu | dragonfly*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ newsos6) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ openbsd*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ ;; -+ -+ os2*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ solaris*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine linker options so we -+ # cannot just pass the convience library names through -+ # without $wl, iff we do not link with $LD. -+ # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ case $wlarc in -+ '') -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -+ esac ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4.3*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_AC_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $rm conftest* -+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; -+esac -+])# AC_LIBTOOL_PROG_LD_SHLIBS -+ -+ -+# _LT_AC_FILE_LTDLL_C -+# ------------------- -+# Be careful that the start marker always follows a newline. -+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -+# /* ltdll.c starts here */ -+# #define WIN32_LEAN_AND_MEAN -+# #include -+# #undef WIN32_LEAN_AND_MEAN -+# #include -+# -+# #ifndef __CYGWIN__ -+# # ifdef __CYGWIN32__ -+# # define __CYGWIN__ __CYGWIN32__ -+# # endif -+# #endif -+# -+# #ifdef __cplusplus -+# extern "C" { -+# #endif -+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -+# #ifdef __cplusplus -+# } -+# #endif -+# -+# #ifdef __CYGWIN__ -+# #include -+# DECLARE_CYGWIN_DLL( DllMain ); -+# #endif -+# HINSTANCE __hDllInstance_base; -+# -+# BOOL APIENTRY -+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -+# { -+# __hDllInstance_base = hInst; -+# return TRUE; -+# } -+# /* ltdll.c ends here */ -+])# _LT_AC_FILE_LTDLL_C -+ -+ -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+ -+ -+# old names -+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+ -+# This is just to silence aclocal about the macro not being used -+ifelse([AC_DISABLE_FAST_INSTALL]) -+ -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) -+ -+AC_DEFUN([LT_AC_PROG_RC], -+[AC_CHECK_TOOL(RC, windres, no) -+]) -+ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_SED. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_MSG_RESULT([$SED]) -+]) -+ -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant . -+# -+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ else -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) -+ fi -+else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT -+])], -+ [$4]) -+elif test $pkg_failed = untried; then -+ ifelse([$4], , [AC_MSG_FAILURE(dnl -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])], -+ [$4]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES -+ -+m4_include([acinclude.m4]) -diff -ruN evolution-2.12.2.orig/addressbook/conduit/Makefile.in evolution-2.12.2/addressbook/conduit/Makefile.in ---- evolution-2.12.2.orig/addressbook/conduit/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/conduit/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/conduit --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privconduitdir)" \ -- "$(DESTDIR)$(conduitdir)" --privconduitLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privconduit_LTLIBRARIES) --am__DEPENDENCIES_1 = --libeaddress_conduit_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/e-util/libeconduit.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(am__DEPENDENCIES_1) --am_libeaddress_conduit_la_OBJECTS = address-conduit.lo --libeaddress_conduit_la_OBJECTS = $(am_libeaddress_conduit_la_OBJECTS) --libeaddress_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libeaddress_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libeaddress_conduit_la_SOURCES) --DIST_SOURCES = $(libeaddress_conduit_la_SOURCES) --conduitDATA_INSTALL = $(INSTALL_DATA) --DATA = $(conduit_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)/e-util \ -@@ -406,89 +397,102 @@ - - # Address Conduit - privconduit_LTLIBRARIES = libeaddress_conduit.la -+ - libeaddress_conduit_la_SOURCES = \ - address-conduit.c - -+ - libeaddress_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - libeaddress_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) - -+ - conduitdir = $(datadir)/gnome-pilot/conduits/ - conduit_DATA = e-address.conduit -+ - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - e-address.conduit.in - -+subdir = addressbook/conduit -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privconduit_LTLIBRARIES) -+ -+libeaddress_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/e-util/libeconduit.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la -+am_libeaddress_conduit_la_OBJECTS = address-conduit.lo -+libeaddress_conduit_la_OBJECTS = $(am_libeaddress_conduit_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/address-conduit.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libeaddress_conduit_la_SOURCES) -+DATA = $(conduit_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libeaddress_conduit_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/conduit/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/conduit/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privconduitLTLIBRARIES_INSTALL = $(INSTALL) - install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ - else :; fi; \ - done - - uninstall-privconduitLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ - done - - clean-privconduitLTLIBRARIES: - -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libeaddress_conduit.la: $(libeaddress_conduit_la_OBJECTS) $(libeaddress_conduit_la_DEPENDENCIES) -- $(libeaddress_conduit_la_LINK) -rpath $(privconduitdir) $(libeaddress_conduit_la_OBJECTS) $(libeaddress_conduit_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privconduitdir) $(libeaddress_conduit_la_LDFLAGS) $(libeaddress_conduit_la_OBJECTS) $(libeaddress_conduit_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -496,49 +500,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/address-conduit.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+conduitDATA_INSTALL = $(INSTALL_DATA) - install-conduitDATA: $(conduit_DATA) - @$(NORMAL_INSTALL) -- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(conduitdir) - @list='$(conduit_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ -- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ -+ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ - done - - uninstall-conduitDATA: - @$(NORMAL_UNINSTALL) - @list='$(conduit_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ -+ rm -f $(DESTDIR)$(conduitdir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -547,7 +576,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -559,11 +587,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -586,23 +613,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -620,10 +652,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -645,7 +676,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -660,34 +691,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-conduitDATA install-privconduitLTLIBRARIES - --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 -@@ -708,25 +729,21 @@ - - ps-am: - --uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-conduitDATA uninstall-info-am \ -+ uninstall-privconduitLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-conduitDATA \ -- 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-privconduitLTLIBRARIES install-ps \ -- install-ps-am 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-conduitDATA \ -- uninstall-privconduitLTLIBRARIES -+ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-conduitDATA install-data install-data-am \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ -+ uninstall-info-am uninstall-privconduitLTLIBRARIES - - - e-address.conduit: e-address.conduit.in -diff -ruN evolution-2.12.2.orig/addressbook/gui/component/Makefile.in evolution-2.12.2/addressbook/gui/component/Makefile.in ---- evolution-2.12.2.orig/addressbook/gui/component/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/gui/component/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,82 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/gui/component --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(gladedir)" \ -- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" --componentLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(component_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_addressbook_la_DEPENDENCIES = $(SMIME_LIB) \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/addressbook/printing/libecontactprint.la \ -- $(top_builddir)/shell/libeshell.la \ -- $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ -- $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ -- $(top_builddir)/filter/libfilter.la \ -- $(top_builddir)/addressbook/util/libeabutil.la \ -- $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ -- $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ -- $(top_builddir)/widgets/table/libetable.la \ -- $(top_builddir)/widgets/text/libetext.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/widgets/misc/libefilterbar.la \ -- $(top_builddir)/widgets/menus/libmenus.la \ -- $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ -- $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_libevolution_addressbook_la_OBJECTS = addressbook-component.lo \ -- addressbook-config.lo addressbook-migrate.lo \ -- autocompletion-config.lo addressbook.lo addressbook-view.lo \ -- component-factory.lo --libevolution_addressbook_la_OBJECTS = \ -- $(am_libevolution_addressbook_la_OBJECTS) --libevolution_addressbook_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(libevolution_addressbook_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_addressbook_la_SOURCES) --DIST_SOURCES = $(libevolution_addressbook_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --serverDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) $(schema_DATA) $(server_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -140,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -151,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -176,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -201,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -209,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -267,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -291,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -315,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -323,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -330,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -339,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -361,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -391,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -410,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -@@ -434,7 +405,9 @@ - $(LDAP_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - component_LTLIBRARIES = libevolution-addressbook.la -+ - libevolution_addressbook_la_SOURCES = \ - addressbook-component.c \ - addressbook-component.h \ -@@ -451,8 +424,10 @@ - component-factory.c - - -+ - # $(top_builddir)/addressbook/printing/libecontactprint.la - @ENABLE_SMIME_TRUE@SMIME_LIB = $(top_builddir)/smime/gui/libevolution-smime.la -+ - libevolution_addressbook_la_LIBADD = \ - $(SMIME_LIB) \ - $(top_builddir)/e-util/libeutil.la \ -@@ -473,93 +448,150 @@ - $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) - -+ - libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - -+ - # GConf schemas - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = apps_evolution_addressbook.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - server_in_files = GNOME_Evolution_Addressbook.server.in.in - server_DATA = $(server_in_files:.server.in.in=.server) -+ - glade_DATA = \ - ldap-config.glade - -+ - BUILT_SOURCES = $(server_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+ - EXTRA_DIST = \ - $(glade_DATA) \ - $(schema_in_files) \ - $(server_in_files) \ - openldap-extract.h - -+ - @ENABLE_PURIFY_TRUE@PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+subdir = addressbook/gui/component -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(component_LTLIBRARIES) -+ -+@ENABLE_SMIME_TRUE@libevolution_addressbook_la_DEPENDENCIES = \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/smime/gui/libevolution-smime.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/e-util/libeutil.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/printing/libecontactprint.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/shell/libeshell.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/filter/libfilter.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/util/libeabutil.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/table/libetable.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/text/libetext.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/misc/libefilterbar.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/widgets/menus/libmenus.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ -+@ENABLE_SMIME_TRUE@ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la -+@ENABLE_SMIME_FALSE@libevolution_addressbook_la_DEPENDENCIES = \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/e-util/libeutil.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/printing/libecontactprint.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/shell/libeshell.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/filter/libfilter.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/util/libeabutil.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/table/libetable.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/text/libetext.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/misc/libefilterbar.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/widgets/menus/libmenus.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ -+@ENABLE_SMIME_FALSE@ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la -+am_libevolution_addressbook_la_OBJECTS = addressbook-component.lo \ -+ addressbook-config.lo addressbook-migrate.lo \ -+ autocompletion-config.lo addressbook.lo addressbook-view.lo \ -+ component-factory.lo -+libevolution_addressbook_la_OBJECTS = \ -+ $(am_libevolution_addressbook_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addressbook-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/addressbook-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/addressbook-migrate.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/addressbook-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/autocompletion-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/component-factory.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_addressbook_la_SOURCES) -+DATA = $(glade_DATA) $(schema_DATA) $(server_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_addressbook_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/component/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/gui/component/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+componentLTLIBRARIES_INSTALL = $(INSTALL) - install-componentLTLIBRARIES: $(component_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ - else :; fi; \ - done - - uninstall-componentLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ - done - - clean-componentLTLIBRARIES: - -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-addressbook.la: $(libevolution_addressbook_la_OBJECTS) $(libevolution_addressbook_la_DEPENDENCIES) -- $(libevolution_addressbook_la_LINK) -rpath $(componentdir) $(libevolution_addressbook_la_OBJECTS) $(libevolution_addressbook_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(componentdir) $(libevolution_addressbook_la_LDFLAGS) $(libevolution_addressbook_la_OBJECTS) $(libevolution_addressbook_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -573,83 +605,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/component-factory.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done -+serverDATA_INSTALL = $(INSTALL_DATA) - install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) -- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" -+ $(mkinstalldirs) $(DESTDIR)$(serverdir) - @list='$(server_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ -- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ -+ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ - done - - uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ -+ rm -f $(DESTDIR)$(serverdir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -658,7 +717,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -670,11 +728,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -697,23 +754,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -730,12 +792,10 @@ - check-am: all-am - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am --@ENABLE_PURIFY_FALSE@all-local: - all-am: Makefile $(LTLIBRARIES) $(DATA) all-local -+ - installdirs: -- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -757,7 +817,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -773,14 +833,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -788,20 +846,12 @@ - install-data-am: install-componentLTLIBRARIES install-data-local \ - install-gladeDATA install-schemaDATA install-serverDATA - --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 -@@ -823,26 +873,22 @@ - ps-am: - - uninstall-am: uninstall-componentLTLIBRARIES uninstall-gladeDATA \ -- uninstall-schemaDATA uninstall-serverDATA -- --.MAKE: install-am install-strip -+ uninstall-info-am uninstall-schemaDATA uninstall-serverDATA - - .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-componentLTLIBRARIES clean-generic clean-libtool ctags \ -- dist-hook distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am \ -- install-componentLTLIBRARIES install-data install-data-am \ -- install-data-local install-dvi install-dvi-am install-exec \ -- install-exec-am install-gladeDATA install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-schemaDATA \ -- install-serverDATA 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-componentLTLIBRARIES \ -- uninstall-gladeDATA uninstall-schemaDATA uninstall-serverDATA -+ distclean distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-componentLTLIBRARIES install-data \ -+ install-data-am install-data-local install-exec install-exec-am \ -+ install-gladeDATA install-info install-info-am install-man \ -+ install-schemaDATA install-serverDATA 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-componentLTLIBRARIES \ -+ uninstall-gladeDATA uninstall-info-am uninstall-schemaDATA \ -+ uninstall-serverDATA - - - @INTLTOOL_SCHEMAS_RULE@ -diff -ruN evolution-2.12.2.orig/addressbook/gui/contact-editor/Makefile.in evolution-2.12.2/addressbook/gui/contact-editor/Makefile.in ---- evolution-2.12.2.orig/addressbook/gui/contact-editor/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/gui/contact-editor/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,63 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/gui/contact-editor --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libecontacteditor_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am__objects_1 = e-contact-editor-marshal.lo --am_libecontacteditor_la_OBJECTS = $(am__objects_1) eab-editor.lo \ -- e-contact-editor-im.lo e-contact-editor-address.lo \ -- e-contact-editor-fullname.lo e-contact-editor.lo \ -- e-contact-quick-add.lo --libecontacteditor_la_OBJECTS = $(am_libecontacteditor_la_OBJECTS) --libecontacteditor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libecontacteditor_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libecontacteditor_la_SOURCES) --DIST_SOURCES = $(libecontacteditor_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -121,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -132,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -157,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -182,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -190,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -248,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -272,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -296,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -304,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -311,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -320,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -342,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -372,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -391,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -@@ -410,9 +401,11 @@ - -DG_LOG_DOMAIN=\"contact-editor\" \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - privsolib_LTLIBRARIES = \ - libecontacteditor.la - -+ - libecontacteditor_la_SOURCES = \ - $(MARSHAL_GENERATED) \ - eab-editor.c \ -@@ -428,91 +421,118 @@ - e-contact-quick-add.c \ - e-contact-quick-add.h - -+ - libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED) -+ - libecontacteditor_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h -+ - glade_DATA = \ - im.glade \ - contact-editor.glade \ - fulladdr.glade \ - fullname.glade - -+ - BUILT_SOURCES = $(MARSHAL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = $(glade_DATA) \ - e-contact-editor-marshal.list - -+subdir = addressbook/gui/contact-editor -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libecontacteditor_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la -+@OS_WIN32_FALSE@libecontacteditor_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la -+am__objects_1 = e-contact-editor-marshal.lo -+am_libecontacteditor_la_OBJECTS = $(am__objects_1) eab-editor.lo \ -+ e-contact-editor-im.lo e-contact-editor-address.lo \ -+ e-contact-editor-fullname.lo e-contact-editor.lo \ -+ e-contact-quick-add.lo -+libecontacteditor_la_OBJECTS = $(am_libecontacteditor_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-contact-editor-address.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor-fullname.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor-im.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-quick-add.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-editor.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libecontacteditor_la_SOURCES) -+DATA = $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libecontacteditor_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/contact-editor/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/gui/contact-editor/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libecontacteditor.la: $(libecontacteditor_la_OBJECTS) $(libecontacteditor_la_DEPENDENCIES) -- $(libecontacteditor_la_LINK) -rpath $(privsolibdir) $(libecontacteditor_la_OBJECTS) $(libecontacteditor_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libecontacteditor_la_LDFLAGS) $(libecontacteditor_la_OBJECTS) $(libecontacteditor_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -526,49 +546,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eab-editor.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -577,7 +622,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -589,11 +633,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -616,23 +659,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -647,10 +695,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -672,7 +719,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -687,34 +734,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-gladeDATA install-privsolibLTLIBRARIES - --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 -@@ -735,24 +772,21 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -- 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-gladeDATA uninstall-privsolibLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-man install-privsolibLTLIBRARIES 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-gladeDATA \ -+ uninstall-info-am uninstall-privsolibLTLIBRARIES - - @EVO_MARSHAL_RULE@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -ruN evolution-2.12.2.orig/addressbook/gui/contact-list-editor/Makefile.in evolution-2.12.2/addressbook/gui/contact-list-editor/Makefile.in ---- evolution-2.12.2.orig/addressbook/gui/contact-list-editor/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/gui/contact-list-editor/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,67 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/gui/contact-list-editor --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(etspecdir)" \ -- "$(DESTDIR)$(gladedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libecontactlisteditor_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/addressbook/util/libeabutil.la \ -- $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ -- $(top_builddir)/widgets/table/libetable.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am__objects_1 = e-contact-list-editor-marshal.lo --am_libecontactlisteditor_la_OBJECTS = $(am__objects_1) \ -- e-contact-list-editor.lo e-contact-list-model.lo --libecontactlisteditor_la_OBJECTS = \ -- $(am_libecontactlisteditor_la_OBJECTS) --libecontactlisteditor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libecontactlisteditor_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libecontactlisteditor_la_SOURCES) --DIST_SOURCES = $(libecontactlisteditor_la_SOURCES) --etspecDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(etspec_DATA) $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -125,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -136,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -161,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -186,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -194,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -252,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -276,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -300,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -308,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -315,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -324,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -346,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -376,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -395,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -@@ -414,9 +401,11 @@ - -DG_LOG_DOMAIN=\"contact-list-editor\" \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - privsolib_LTLIBRARIES = \ - libecontactlisteditor.la - -+ - libecontactlisteditor_la_SOURCES = \ - $(MARSHAL_GENERATED) \ - e-contact-list-editor.c \ -@@ -424,7 +413,9 @@ - e-contact-list-model.c \ - e-contact-list-model.h - -+ - libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) -+ - libecontactlisteditor_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/addressbook/util/libeabutil.la \ -@@ -434,81 +425,107 @@ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h -+ - glade_DATA = contact-list-editor.glade - etspec_DATA = e-contact-list-editor.etspec -+ - BUILT_SOURCES = $(MARSHAL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = $(glade_DATA) \ - $(etspec_DATA) \ - e-contact-list-editor-marshal.list - -+subdir = addressbook/gui/contact-list-editor -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libecontactlisteditor_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-addressbook.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/addressbook/util/libeabutil.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/table/libetable.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la -+@OS_WIN32_FALSE@libecontactlisteditor_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/addressbook/util/libeabutil.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/table/libetable.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la -+am__objects_1 = e-contact-list-editor-marshal.lo -+am_libecontactlisteditor_la_OBJECTS = $(am__objects_1) \ -+ e-contact-list-editor.lo e-contact-list-model.lo -+libecontactlisteditor_la_OBJECTS = \ -+ $(am_libecontactlisteditor_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-contact-list-editor-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-list-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-list-model.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libecontactlisteditor_la_SOURCES) -+DATA = $(etspec_DATA) $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libecontactlisteditor_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/contact-list-editor/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/gui/contact-list-editor/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libecontactlisteditor.la: $(libecontactlisteditor_la_OBJECTS) $(libecontactlisteditor_la_DEPENDENCIES) -- $(libecontactlisteditor_la_LINK) -rpath $(privsolibdir) $(libecontactlisteditor_la_OBJECTS) $(libecontactlisteditor_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libecontactlisteditor_la_LDFLAGS) $(libecontactlisteditor_la_OBJECTS) $(libecontactlisteditor_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -518,66 +535,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-contact-list-model.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+etspecDATA_INSTALL = $(INSTALL_DATA) - install-etspecDATA: $(etspec_DATA) - @$(NORMAL_INSTALL) -- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(etspecdir) - @list='$(etspec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ -- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ -+ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ - done - - uninstall-etspecDATA: - @$(NORMAL_UNINSTALL) - @list='$(etspec_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(etspecdir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -586,7 +629,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -598,11 +640,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -625,23 +666,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -656,10 +702,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(etspecdir) $(DESTDIR)$(gladedir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -681,7 +726,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -696,14 +741,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -711,20 +754,12 @@ - install-data-am: install-etspecDATA install-gladeDATA \ - install-privsolibLTLIBRARIES - --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 -@@ -745,25 +780,21 @@ - - ps-am: - --uninstall-am: uninstall-etspecDATA uninstall-gladeDATA \ -+uninstall-am: uninstall-etspecDATA uninstall-gladeDATA uninstall-info-am \ - uninstall-privsolibLTLIBRARIES - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-etspecDATA install-exec install-exec-am \ -- install-gladeDATA install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-etspecDATA \ -+ install-exec install-exec-am install-gladeDATA install-info \ -+ install-info-am install-man install-privsolibLTLIBRARIES \ - 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-etspecDATA uninstall-gladeDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-etspecDATA uninstall-gladeDATA uninstall-info-am \ - uninstall-privsolibLTLIBRARIES - - @EVO_MARSHAL_RULE@ -diff -ruN evolution-2.12.2.orig/addressbook/gui/Makefile.in evolution-2.12.2/addressbook/gui/Makefile.in ---- evolution-2.12.2.orig/addressbook/gui/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/gui/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/gui --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = merging contact-editor contact-list-editor widgets component -+subdir = addressbook/gui -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/gui/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/addressbook/gui/merging/Makefile.in evolution-2.12.2/addressbook/gui/merging/Makefile.in ---- evolution-2.12.2.orig/addressbook/gui/merging/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/gui/merging/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,53 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/gui/merging --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libeabbookmerging_la_LIBADD = --am_libeabbookmerging_la_OBJECTS = eab-contact-compare.lo \ -- eab-contact-merging.lo --libeabbookmerging_la_OBJECTS = $(am_libeabbookmerging_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libeabbookmerging_la_SOURCES) --DIST_SOURCES = $(libeabbookmerging_la_SOURCES) --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(gladedir)" --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -111,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -122,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -147,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -172,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -180,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -238,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -262,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -294,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -301,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -310,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -332,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -362,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -381,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DG_LOG_DOMAIN=\"eab-contact-merging\" \ -@@ -394,68 +394,79 @@ - -I$(top_srcdir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - noinst_LTLIBRARIES = \ - libeabbookmerging.la - -+ - libeabbookmerging_la_SOURCES = \ - eab-contact-compare.c \ - eab-contact-compare.h \ - eab-contact-merging.c \ - eab-contact-merging.h - -+ - glade_DATA = eab-contact-duplicate-detected.glade \ - eab-contact-commit-duplicate-detected.glade - -+ - EXTRA_DIST = \ - $(glade_DATA) - -+subdir = addressbook/gui/merging -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libeabbookmerging_la_LDFLAGS = -+libeabbookmerging_la_LIBADD = -+am_libeabbookmerging_la_OBJECTS = eab-contact-compare.lo \ -+ eab-contact-merging.lo -+libeabbookmerging_la_OBJECTS = $(am_libeabbookmerging_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/eab-contact-compare.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-contact-merging.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libeabbookmerging_la_SOURCES) -+DATA = $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libeabbookmerging_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/merging/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/gui/merging/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libeabbookmerging.la: $(libeabbookmerging_la_OBJECTS) $(libeabbookmerging_la_DEPENDENCIES) -- $(LINK) $(libeabbookmerging_la_OBJECTS) $(libeabbookmerging_la_LIBADD) $(LIBS) -+ $(LINK) $(libeabbookmerging_la_LDFLAGS) $(libeabbookmerging_la_OBJECTS) $(libeabbookmerging_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -464,49 +475,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eab-contact-merging.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -515,7 +551,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -527,11 +562,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -554,23 +588,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -584,10 +623,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -607,7 +645,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -621,34 +659,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-gladeDATA - --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 -@@ -669,23 +697,19 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA 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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA 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-gladeDATA -+ uninstall-am uninstall-gladeDATA 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 -ruN evolution-2.12.2.orig/addressbook/gui/widgets/Makefile.in evolution-2.12.2/addressbook/gui/widgets/Makefile.in ---- evolution-2.12.2.orig/addressbook/gui/widgets/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/gui/widgets/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,71 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/gui/widgets --DIST_COMMON = $(eabinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libeabwidgets_la_LIBADD = --am__objects_1 = --am__objects_2 = $(am__objects_1) --am__objects_3 = Evolution-Composer-common.lo \ -- Evolution-Composer-skels.lo Evolution-Composer-stubs.lo --am__objects_4 = $(am__objects_3) --am__objects_5 = $(am__objects_2) $(am__objects_4) --am__objects_6 = eab-marshal.lo --am_libeabwidgets_la_OBJECTS = $(am__objects_5) $(am__objects_6) \ -- eab-config.lo eab-contact-display.lo eab-gui-util.lo \ -- eab-menu.lo eab-popup.lo eab-popup-control.lo \ -- eab-vcard-control.lo e-minicard.lo e-minicard-label.lo \ -- e-minicard-view.lo e-minicard-view-widget.lo \ -- e-addressbook-reflow-adapter.lo e-addressbook-table-adapter.lo \ -- e-addressbook-model.lo e-addressbook-view.lo \ -- gal-view-minicard.lo gal-view-factory-minicard.lo --libeabwidgets_la_OBJECTS = $(am_libeabwidgets_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libeabwidgets_la_SOURCES) --DIST_SOURCES = $(libeabwidgets_la_SOURCES) --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(ruledir)" \ -- "$(DESTDIR)$(eabincludedir)" --etspecDATA_INSTALL = $(INSTALL_DATA) --ruleDATA_INSTALL = $(INSTALL_DATA) --DATA = $(etspec_DATA) $(rule_DATA) --eabincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(eabinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -130,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -141,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -166,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -191,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -199,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -281,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -305,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -313,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -320,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -329,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -351,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -381,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -400,14 +384,12 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - ruledir = $(privdatadir) - rule_DATA = addresstypes.xml -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"eab-widgets\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -@@ -423,6 +405,7 @@ - -I$(top_builddir)/shell \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - CORBA_COMPOSER_SOURCE_H = \ - Evolution-Composer.h - -@@ -432,18 +415,23 @@ - Evolution-Composer-stubs.c - - CORBA_COMPOSER_IDL = $(srcdir)/../../../composer/Evolution-Composer.idl -+ - CORBA_SOURCE_H = $(CORBA_COMPOSER_SOURCE_H) - CORBA_SOURCE_C = $(CORBA_COMPOSER_SOURCE_C) - CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C) -+ - noinst_LTLIBRARIES = \ - libeabwidgets.la - -+ - eabincludedir = $(privincludedir)/addressbook/gui/widgets -+ - eabinclude_HEADERS = \ - eab-config.h \ - eab-menu.h \ - eab-popup.h - -+ - libeabwidgets_la_SOURCES = \ - $(CORBA_SOURCE) \ - $(MARSHAL_GENERATED) \ -@@ -481,6 +469,7 @@ - gal-view-factory-minicard.h - - -+ - #TREEVIEW_SOURCES= e-addressbook-treeview-adapter.c \ - # e-addressbook-treeview-adapter.h \ - # gal-view-factory-treeview.c \ -@@ -488,62 +477,106 @@ - # gal-view-treeview.c \ - # gal-view-treeview.h - MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -+ - BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) -+ - etspec_DATA = e-addressbook-view.etspec -+ - EXTRA_DIST = \ - $(etspec_DATA) \ - eab-marshal.list \ - addresstypes.xml - -+subdir = addressbook/gui/widgets -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libeabwidgets_la_LDFLAGS = -+libeabwidgets_la_LIBADD = -+am__objects_1 = -+am__objects_2 = $(am__objects_1) -+am__objects_3 = Evolution-Composer-common.lo Evolution-Composer-skels.lo \ -+ Evolution-Composer-stubs.lo -+am__objects_4 = $(am__objects_3) -+am__objects_5 = $(am__objects_2) $(am__objects_4) -+am__objects_6 = eab-marshal.lo -+am_libeabwidgets_la_OBJECTS = $(am__objects_5) $(am__objects_6) \ -+ eab-config.lo eab-contact-display.lo eab-gui-util.lo \ -+ eab-menu.lo eab-popup.lo eab-popup-control.lo \ -+ eab-vcard-control.lo e-minicard.lo e-minicard-label.lo \ -+ e-minicard-view.lo e-minicard-view-widget.lo \ -+ e-addressbook-reflow-adapter.lo e-addressbook-table-adapter.lo \ -+ e-addressbook-model.lo e-addressbook-view.lo \ -+ gal-view-minicard.lo gal-view-factory-minicard.lo -+libeabwidgets_la_OBJECTS = $(am_libeabwidgets_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-Composer-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-reflow-adapter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-table-adapter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-addressbook-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard-label.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard-view-widget.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-minicard.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-contact-display.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-gui-util.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-menu.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-popup-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-popup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-vcard-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-factory-minicard.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-minicard.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libeabwidgets_la_SOURCES) -+DATA = $(etspec_DATA) $(rule_DATA) -+ -+HEADERS = $(eabinclude_HEADERS) -+ -+DIST_COMMON = $(eabinclude_HEADERS) $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libeabwidgets_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/gui/widgets/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/gui/widgets/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libeabwidgets.la: $(libeabwidgets_la_OBJECTS) $(libeabwidgets_la_DEPENDENCIES) -- $(LINK) $(libeabwidgets_la_OBJECTS) $(libeabwidgets_la_LIBADD) $(LIBS) -+ $(LINK) $(libeabwidgets_la_LDFLAGS) $(libeabwidgets_la_OBJECTS) $(libeabwidgets_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -571,83 +604,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-view-minicard.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+etspecDATA_INSTALL = $(INSTALL_DATA) - install-etspecDATA: $(etspec_DATA) - @$(NORMAL_INSTALL) -- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(etspecdir) - @list='$(etspec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ -- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ -+ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ - done - - uninstall-etspecDATA: - @$(NORMAL_UNINSTALL) - @list='$(etspec_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(etspecdir)/$$f; \ - done -+ruleDATA_INSTALL = $(INSTALL_DATA) - install-ruleDATA: $(rule_DATA) - @$(NORMAL_INSTALL) -- test -z "$(ruledir)" || $(MKDIR_P) "$(DESTDIR)$(ruledir)" -+ $(mkinstalldirs) $(DESTDIR)$(ruledir) - @list='$(rule_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(ruleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ruledir)/$$f'"; \ -- $(ruleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ruledir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f"; \ -+ $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f; \ - done - - uninstall-ruleDATA: - @$(NORMAL_UNINSTALL) - @list='$(rule_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(ruledir)/$$f'"; \ -- rm -f "$(DESTDIR)$(ruledir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(ruledir)/$$f"; \ -+ rm -f $(DESTDIR)$(ruledir)/$$f; \ - done -+eabincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-eabincludeHEADERS: $(eabinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(eabincludedir)" || $(MKDIR_P) "$(DESTDIR)$(eabincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(eabincludedir) - @list='$(eabinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(eabincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eabincludedir)/$$f'"; \ -- $(eabincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eabincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(eabincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eabincludedir)/$$f"; \ -+ $(eabincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eabincludedir)/$$f; \ - done - - uninstall-eabincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(eabinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(eabincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(eabincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(eabincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(eabincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -656,7 +716,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -668,11 +727,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -695,23 +753,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -729,10 +792,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(ruledir)" "$(DESTDIR)$(eabincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(etspecdir) $(DESTDIR)$(ruledir) $(DESTDIR)$(eabincludedir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -754,7 +816,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -769,14 +831,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -784,20 +844,12 @@ - install-data-am: install-eabincludeHEADERS install-etspecDATA \ - install-ruleDATA - --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 -@@ -819,25 +871,21 @@ - ps-am: - - uninstall-am: uninstall-eabincludeHEADERS uninstall-etspecDATA \ -- uninstall-ruleDATA -- --.MAKE: install-am install-strip -+ uninstall-info-am uninstall-ruleDATA - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \ -- 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 \ -+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am \ - install-eabincludeHEADERS install-etspecDATA 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-ruleDATA 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-eabincludeHEADERS \ -- uninstall-etspecDATA uninstall-ruleDATA -+ install-exec-am install-info install-info-am install-man \ -+ install-ruleDATA 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-eabincludeHEADERS uninstall-etspecDATA \ -+ uninstall-info-am uninstall-ruleDATA - - - $(CORBA_COMPOSER_SOURCE_H): $(CORBA_COMPOSER_IDL) -diff -ruN evolution-2.12.2.orig/addressbook/importers/Makefile.in evolution-2.12.2/addressbook/importers/Makefile.in ---- evolution-2.12.2.orig/addressbook/importers/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/importers/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,63 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/importers --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_addressbook_importers_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/addressbook/util/libeabutil.la \ -- $(am__DEPENDENCIES_1) --am_libevolution_addressbook_importers_la_OBJECTS = \ -- evolution-ldif-importer.lo evolution-vcard-importer.lo \ -- evolution-csv-importer.lo --libevolution_addressbook_importers_la_OBJECTS = \ -- $(am_libevolution_addressbook_importers_la_OBJECTS) --libevolution_addressbook_importers_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_addressbook_importers_la_LDFLAGS) $(LDFLAGS) -o \ -- $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_addressbook_importers_la_SOURCES) --DIST_SOURCES = $(libevolution_addressbook_importers_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,15 +384,14 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - privsolib_LTLIBRARIES = \ - libevolution-addressbook-importers.la - -+ - INCLUDES = \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ -@@ -408,83 +401,96 @@ - -I$(top_builddir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - libevolution_addressbook_importers_la_SOURCES = \ - evolution-ldif-importer.c \ - evolution-vcard-importer.c \ - evolution-csv-importer.c \ - evolution-addressbook-importers.h - -+ - libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED) -+ - libevolution_addressbook_importers_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(IMPORTERS_LIBS) - -+subdir = addressbook/importers -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libevolution_addressbook_importers_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/addressbook/util/libeabutil.la -+am_libevolution_addressbook_importers_la_OBJECTS = \ -+ evolution-ldif-importer.lo evolution-vcard-importer.lo \ -+ evolution-csv-importer.lo -+libevolution_addressbook_importers_la_OBJECTS = \ -+ $(am_libevolution_addressbook_importers_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/evolution-csv-importer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-ldif-importer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-vcard-importer.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_addressbook_importers_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_addressbook_importers_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/importers/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/importers/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-addressbook-importers.la: $(libevolution_addressbook_importers_la_OBJECTS) $(libevolution_addressbook_importers_la_DEPENDENCIES) -- $(libevolution_addressbook_importers_la_LINK) -rpath $(privsolibdir) $(libevolution_addressbook_importers_la_OBJECTS) $(libevolution_addressbook_importers_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_addressbook_importers_la_LDFLAGS) $(libevolution_addressbook_importers_la_OBJECTS) $(libevolution_addressbook_importers_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -494,25 +500,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evolution-vcard-importer.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -520,6 +538,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -528,7 +558,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -540,11 +569,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -567,23 +595,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +630,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -620,7 +652,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -634,34 +666,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -682,23 +704,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/addressbook/Makefile.in evolution-2.12.2/addressbook/Makefile.in ---- evolution-2.12.2.orig/addressbook/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,46 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(errordir)" --errorDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) --RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -- distclean-recursive maintainer-clean-recursive --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = util printing importers gui tools conduit --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -103,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -114,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -139,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -164,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -172,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -230,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -254,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -278,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -286,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -293,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -302,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -324,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -354,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -373,77 +384,76 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - @ENABLE_PILOT_CONDUITS_TRUE@CONDUIT_SUBDIR = conduit -+ - SUBDIRS = util printing importers gui tools $(CONDUIT_SUBDIR) -+ - error_DATA = addressbook.error - errordir = $(privdatadir)/errors -+ - EXTRA_DIST = \ - ChangeLog.pre-1-4 \ - addressbook.error.xml - -+ - BUILT_SOURCES = $(error_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = addressbook -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(error_DATA) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+DIST_SUBDIRS = util printing importers gui tools conduit - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -453,13 +463,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -471,20 +475,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -505,7 +504,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -516,6 +515,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -524,22 +531,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -549,11 +553,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -576,23 +579,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -605,17 +613,13 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -629,9 +633,8 @@ - all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(errordir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(errordir) -+ - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -653,7 +656,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -665,34 +668,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: install-errorDATA - --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 -@@ -711,24 +705,26 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA -+uninstall-am: uninstall-errorDATA 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 dist-hook distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-errorDATA \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am uninstall-errorDATA -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-errorDATA install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-errorDATA \ -+ uninstall-info-am uninstall-info-recursive uninstall-recursive - - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/addressbook/printing/Makefile.in evolution-2.12.2/addressbook/printing/Makefile.in ---- evolution-2.12.2.orig/addressbook/printing/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/printing/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,74 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = contact-print-test$(EXEEXT) \ -- contact-print-style-editor-test$(EXEEXT) --subdir = addressbook/printing --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libecontactprint_la_LIBADD = --am_libecontactprint_la_OBJECTS = e-contact-print-style-editor.lo \ -- e-contact-print.lo --libecontactprint_la_OBJECTS = $(am_libecontactprint_la_OBJECTS) --PROGRAMS = $(noinst_PROGRAMS) --am_contact_print_style_editor_test_OBJECTS = \ -- test-contact-print-style-editor.$(OBJEXT) --contact_print_style_editor_test_OBJECTS = \ -- $(am_contact_print_style_editor_test_OBJECTS) --am__DEPENDENCIES_1 = --contact_print_style_editor_test_DEPENDENCIES = libecontactprint.la \ -- $(top_builddir)/addressbook/util/libeabutil.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_contact_print_test_OBJECTS = test-print.$(OBJEXT) --contact_print_test_OBJECTS = $(am_contact_print_test_OBJECTS) --contact_print_test_DEPENDENCIES = libecontactprint.la \ -- $(top_builddir)/addressbook/util/libeabutil.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libecontactprint_la_SOURCES) \ -- $(contact_print_style_editor_test_SOURCES) \ -- $(contact_print_test_SOURCES) --DIST_SOURCES = $(libecontactprint_la_SOURCES) \ -- $(contact_print_style_editor_test_SOURCES) \ -- $(contact_print_test_SOURCES) --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(ecpsdir)" "$(DESTDIR)$(gladedir)" --ecpsDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(ecps_DATA) $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -133,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -144,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -169,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -194,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -202,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -260,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -284,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -308,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -316,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -323,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -332,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -354,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -384,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -403,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - ecpsdir = $(privdatadir)/ecps - ecps_DATA = \ -@@ -415,9 +393,11 @@ - medbook.ecps \ - phonelist.ecps - -+ - glade_DATA = \ - e-contact-print.glade - -+ - INCLUDES = \ - $(GNOME_INCLUDEDIR) \ - -DG_LOG_DOMAIN=\"addressbook-printing\" \ -@@ -429,9 +409,11 @@ - -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - noinst_LTLIBRARIES = \ - libecontactprint.la - -+ - libecontactprint_la_SOURCES = \ - e-contact-print-style-editor.c \ - e-contact-print-style-editor.h \ -@@ -439,72 +421,111 @@ - e-contact-print.c \ - e-contact-print.h - -+ -+noinst_PROGRAMS = \ -+ contact-print-test \ -+ contact-print-style-editor-test -+ -+ - contact_print_test_SOURCES = \ - test-print.c - -+ - contact_print_test_LDADD = \ - libecontactprint.la \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - contact_print_style_editor_test_SOURCES = \ - test-contact-print-style-editor.c - -+ - contact_print_style_editor_test_LDADD = \ - libecontactprint.la \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - EXTRA_DIST = \ - $(glade_DATA) \ - $(ecps_DATA) - -+subdir = addressbook/printing -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libecontactprint_la_LDFLAGS = -+libecontactprint_la_LIBADD = -+am_libecontactprint_la_OBJECTS = e-contact-print-style-editor.lo \ -+ e-contact-print.lo -+libecontactprint_la_OBJECTS = $(am_libecontactprint_la_OBJECTS) -+noinst_PROGRAMS = contact-print-test$(EXEEXT) \ -+ contact-print-style-editor-test$(EXEEXT) -+PROGRAMS = $(noinst_PROGRAMS) -+ -+am_contact_print_style_editor_test_OBJECTS = \ -+ test-contact-print-style-editor.$(OBJEXT) -+contact_print_style_editor_test_OBJECTS = \ -+ $(am_contact_print_style_editor_test_OBJECTS) -+contact_print_style_editor_test_DEPENDENCIES = libecontactprint.la \ -+ $(top_builddir)/addressbook/util/libeabutil.la \ -+ $(top_builddir)/e-util/libeutil.la -+contact_print_style_editor_test_LDFLAGS = -+am_contact_print_test_OBJECTS = test-print.$(OBJEXT) -+contact_print_test_OBJECTS = $(am_contact_print_test_OBJECTS) -+contact_print_test_DEPENDENCIES = libecontactprint.la \ -+ $(top_builddir)/addressbook/util/libeabutil.la \ -+ $(top_builddir)/e-util/libeutil.la -+contact_print_test_LDFLAGS = -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-contact-print-style-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-contact-print.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-contact-print-style-editor.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-print.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libecontactprint_la_SOURCES) \ -+ $(contact_print_style_editor_test_SOURCES) \ -+ $(contact_print_test_SOURCES) -+DATA = $(ecps_DATA) $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libecontactprint_la_SOURCES) $(contact_print_style_editor_test_SOURCES) $(contact_print_test_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/printing/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/printing/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libecontactprint.la: $(libecontactprint_la_OBJECTS) $(libecontactprint_la_DEPENDENCIES) -- $(LINK) $(libecontactprint_la_OBJECTS) $(libecontactprint_la_LIBADD) $(LIBS) -+ $(LINK) $(libecontactprint_la_LDFLAGS) $(libecontactprint_la_OBJECTS) $(libecontactprint_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -514,13 +535,13 @@ - done - contact-print-style-editor-test$(EXEEXT): $(contact_print_style_editor_test_OBJECTS) $(contact_print_style_editor_test_DEPENDENCIES) - @rm -f contact-print-style-editor-test$(EXEEXT) -- $(LINK) $(contact_print_style_editor_test_OBJECTS) $(contact_print_style_editor_test_LDADD) $(LIBS) -+ $(LINK) $(contact_print_style_editor_test_LDFLAGS) $(contact_print_style_editor_test_OBJECTS) $(contact_print_style_editor_test_LDADD) $(LIBS) - contact-print-test$(EXEEXT): $(contact_print_test_OBJECTS) $(contact_print_test_DEPENDENCIES) - @rm -f contact-print-test$(EXEEXT) -- $(LINK) $(contact_print_test_OBJECTS) $(contact_print_test_LDADD) $(LIBS) -+ $(LINK) $(contact_print_test_LDFLAGS) $(contact_print_test_OBJECTS) $(contact_print_test_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -531,66 +552,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-print.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ecpsDATA_INSTALL = $(INSTALL_DATA) - install-ecpsDATA: $(ecps_DATA) - @$(NORMAL_INSTALL) -- test -z "$(ecpsdir)" || $(MKDIR_P) "$(DESTDIR)$(ecpsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(ecpsdir) - @list='$(ecps_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(ecpsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ecpsdir)/$$f'"; \ -- $(ecpsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ecpsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(ecpsDATA_INSTALL) $$d$$p $(DESTDIR)$(ecpsdir)/$$f"; \ -+ $(ecpsDATA_INSTALL) $$d$$p $(DESTDIR)$(ecpsdir)/$$f; \ - done - - uninstall-ecpsDATA: - @$(NORMAL_UNINSTALL) - @list='$(ecps_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(ecpsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(ecpsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(ecpsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(ecpsdir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -599,7 +646,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -611,11 +657,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -638,23 +683,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -668,10 +718,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(ecpsdir)" "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(ecpsdir) $(DESTDIR)$(gladedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -691,7 +740,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -705,34 +754,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-ecpsDATA install-gladeDATA - --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 -@@ -753,24 +792,20 @@ - - ps-am: - --uninstall-am: uninstall-ecpsDATA uninstall-gladeDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-ecpsDATA uninstall-gladeDATA uninstall-info-am - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - 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-ecpsDATA \ -- install-exec install-exec-am install-gladeDATA install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-ecpsDATA uninstall-gladeDATA -+ distclean-libtool distclean-tags distdir dvi dvi-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-ecpsDATA install-exec install-exec-am install-gladeDATA \ -+ 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-ecpsDATA \ -+ uninstall-gladeDATA 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 -ruN evolution-2.12.2.orig/addressbook/tools/Makefile.in evolution-2.12.2/addressbook/tools/Makefile.in ---- evolution-2.12.2.orig/addressbook/tools/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/tools/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,55 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --privlibexec_PROGRAMS = evolution-addressbook-export$(EXEEXT) --subdir = addressbook/tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- $(srcdir)/csv2vcard.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = csv2vcard --am__installdirs = "$(DESTDIR)$(privlibexecdir)" \ -- "$(DESTDIR)$(privlibexecdir)" --privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --PROGRAMS = $(privlibexec_PROGRAMS) --am_evolution_addressbook_export_OBJECTS = \ -- evolution-addressbook-export.$(OBJEXT) \ -- evolution-addressbook-export-list-cards.$(OBJEXT) \ -- evolution-addressbook-export-list-folders.$(OBJEXT) --evolution_addressbook_export_OBJECTS = \ -- $(am_evolution_addressbook_export_OBJECTS) --am__DEPENDENCIES_1 = --evolution_addressbook_export_DEPENDENCIES = $(am__DEPENDENCIES_1) --privlibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) --SCRIPTS = $(privlibexec_SCRIPTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(evolution_addressbook_export_SOURCES) --DIST_SOURCES = $(evolution_addressbook_export_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -113,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -124,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -149,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -174,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -182,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -240,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -264,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -288,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -296,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -303,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -312,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -334,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -364,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -383,16 +384,18 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - privlibexec_SCRIPTS = \ - csv2vcard \ - evolution-addressbook-clean - -+ -+privlibexec_PROGRAMS = \ -+ evolution-addressbook-export -+ -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-addressbook-tools\" \ - -I$(top_srcdir) \ -@@ -406,65 +409,83 @@ - -I$(top_builddir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - evolution_addressbook_export_SOURCES = \ - evolution-addressbook-export.c \ - evolution-addressbook-export-list-cards.c \ - evolution-addressbook-export-list-folders.c \ - evolution-addressbook-export.h - -+ - evolution_addressbook_export_LDADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - EXTRA_DIST = $(privlibexec_SCRIPTS) \ - evolution-addressbook-clean.in - -+ - CLEANFILES = evolution-addressbook-clean -+subdir = addressbook/tools -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = csv2vcard -+privlibexec_PROGRAMS = evolution-addressbook-export$(EXEEXT) -+PROGRAMS = $(privlibexec_PROGRAMS) -+ -+am_evolution_addressbook_export_OBJECTS = \ -+ evolution-addressbook-export.$(OBJEXT) \ -+ evolution-addressbook-export-list-cards.$(OBJEXT) \ -+ evolution-addressbook-export-list-folders.$(OBJEXT) -+evolution_addressbook_export_OBJECTS = \ -+ $(am_evolution_addressbook_export_OBJECTS) -+evolution_addressbook_export_DEPENDENCIES = -+evolution_addressbook_export_LDFLAGS = -+SCRIPTS = $(privlibexec_SCRIPTS) -+ -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-addressbook-export-list-cards.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-addressbook-export-list-folders.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-addressbook-export.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(evolution_addressbook_export_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am csv2vcard.in -+SOURCES = $(evolution_addressbook_export_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/tools/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/tools/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --csv2vcard: $(top_builddir)/config.status $(srcdir)/csv2vcard.in -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+csv2vcard: $(top_builddir)/config.status csv2vcard.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ - else :; fi; \ - done - -@@ -472,8 +493,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ - done - - clean-privlibexecPROGRAMS: -@@ -484,16 +505,17 @@ - done - evolution-addressbook-export$(EXEEXT): $(evolution_addressbook_export_OBJECTS) $(evolution_addressbook_export_DEPENDENCIES) - @rm -f evolution-addressbook-export$(EXEEXT) -- $(LINK) $(evolution_addressbook_export_OBJECTS) $(evolution_addressbook_export_LDADD) $(LIBS) -+ $(LINK) $(evolution_addressbook_export_LDFLAGS) $(evolution_addressbook_export_OBJECTS) $(evolution_addressbook_export_LDADD) $(LIBS) -+privlibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) - install-privlibexecSCRIPTS: $(privlibexec_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) - @list='$(privlibexec_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(privlibexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- $(privlibexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(privlibexecdir)/$$f"; \ -+ echo " $(privlibexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ $(privlibexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(privlibexecdir)/$$f; \ - else :; fi; \ - done - -@@ -501,12 +523,12 @@ - @$(NORMAL_UNINSTALL) - @list='$(privlibexec_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ - done - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -516,25 +538,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evolution-addressbook-export.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -542,6 +576,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -550,7 +596,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -562,11 +607,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -589,23 +633,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -619,10 +668,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(PROGRAMS) $(SCRIPTS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(privlibexecdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) $(DESTDIR)$(privlibexecdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -643,7 +691,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -657,35 +705,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: - --install-dvi: install-dvi-am -- --install-exec-am: install-privlibexecPROGRAMS \ -- install-privlibexecSCRIPTS -- --install-html: install-html-am -+install-exec-am: install-privlibexecPROGRAMS install-privlibexecSCRIPTS - - install-info: install-info-am - - install-man: - --install-pdf: install-pdf-am -- --install-ps: install-ps-am -- - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -706,24 +743,20 @@ - - ps-am: - --uninstall-am: uninstall-privlibexecPROGRAMS \ -+uninstall-am: uninstall-info-am uninstall-privlibexecPROGRAMS \ - uninstall-privlibexecSCRIPTS - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privlibexecPROGRAMS 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-privlibexecPROGRAMS \ -- install-privlibexecSCRIPTS install-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-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-privlibexecPROGRAMS install-privlibexecSCRIPTS \ - 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 \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-privlibexecPROGRAMS uninstall-privlibexecSCRIPTS - - -diff -ruN evolution-2.12.2.orig/addressbook/util/Makefile.in evolution-2.12.2/addressbook/util/Makefile.in ---- evolution-2.12.2.orig/addressbook/util/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/addressbook/util/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,57 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = addressbook/util --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libeabutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la --am_libeabutil_la_OBJECTS = eab-marshal.lo eab-book-util.lo --libeabutil_la_OBJECTS = $(am_libeabutil_la_OBJECTS) --libeabutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libeabutil_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libeabutil_la_SOURCES) --DIST_SOURCES = $(libeabutil_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -114,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -125,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -150,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -175,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -183,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -241,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -265,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -289,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -297,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -304,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -313,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -335,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -365,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -384,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DPREFIX=\"$(prefix)\" \ -@@ -402,90 +399,103 @@ - -I$(top_srcdir)/shell \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - privsolib_LTLIBRARIES = libeabutil.la -+ - libeabutil_la_SOURCES = \ - eab-marshal.c \ - eab-book-util.c \ - eab-book-util.h - -+ - libeabutil_la_LDFLAGS = $(NO_UNDEFINED) -+ - libeabutil_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la - -+ - MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -+ - BUILT_SOURCES = $(MARSHAL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - eab-marshal.list - -+subdir = addressbook/util -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libeabutil_la_DEPENDENCIES = \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+am_libeabutil_la_OBJECTS = eab-marshal.lo eab-book-util.lo -+libeabutil_la_OBJECTS = $(am_libeabutil_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/eab-book-util.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/eab-marshal.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libeabutil_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libeabutil_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu addressbook/util/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu addressbook/util/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libeabutil.la: $(libeabutil_la_OBJECTS) $(libeabutil_la_DEPENDENCIES) -- $(libeabutil_la_LINK) -rpath $(privsolibdir) $(libeabutil_la_OBJECTS) $(libeabutil_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libeabutil_la_LDFLAGS) $(libeabutil_la_OBJECTS) $(libeabutil_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -494,25 +504,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eab-marshal.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -520,6 +542,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -528,7 +562,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -540,11 +573,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -567,23 +599,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -601,10 +638,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -626,7 +662,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -641,34 +677,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -689,23 +715,19 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privsolibLTLIBRARIES ctags dist-hook \ -- 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-privsolibLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ clean-libtool clean-privsolibLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-info-am \ - uninstall-privsolibLTLIBRARIES - - @EVO_MARSHAL_RULE@ -diff -ruN evolution-2.12.2.orig/art/Makefile.in evolution-2.12.2/art/Makefile.in ---- evolution-2.12.2.orig/art/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/art/Makefile.in 2007-12-05 15:54:51.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,45 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = art --DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(icon16dir)" "$(DESTDIR)$(icon22dir)" \ -- "$(DESTDIR)$(icon24dir)" "$(DESTDIR)$(icon32dir)" \ -- "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(imagesdir)" \ -- "$(DESTDIR)$(svgicondir)" --icon16DATA_INSTALL = $(INSTALL_DATA) --icon22DATA_INSTALL = $(INSTALL_DATA) --icon24DATA_INSTALL = $(INSTALL_DATA) --icon32DATA_INSTALL = $(INSTALL_DATA) --icon48DATA_INSTALL = $(INSTALL_DATA) --imagesDATA_INSTALL = $(INSTALL_DATA) --svgiconDATA_INSTALL = $(INSTALL_DATA) --DATA = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) \ -- $(icon48_DATA) $(images_DATA) $(svgicon_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -102,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -113,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -138,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -163,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -171,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -229,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -253,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -277,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -285,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -292,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -301,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -323,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -353,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -372,20 +384,21 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - icon16dir = $(datadir)/icons/hicolor/16x16/apps - icon16_DATA = 16x16/evolution.png -+ - icon22dir = $(datadir)/icons/hicolor/22x22/apps - icon22_DATA = 22x22/evolution.png -+ - icon24dir = $(datadir)/icons/hicolor/24x24/apps - icon24_DATA = 24x24/evolution.png -+ - icon32dir = $(datadir)/icons/hicolor/32x32/apps - icon32_DATA = 32x32/evolution.png -+ - icon48dir = $(datadir)/icons/hicolor/48x48/apps - icon48_DATA = \ - 48x48/preferences-autocompletion.png \ -@@ -395,9 +408,12 @@ - 48x48/preferences-mail-accounts.png \ - 48x48/preferences-mail.png - -+ - svgicondir = $(datadir)/icons/hicolor/scalable/apps - svgicon_DATA = scalable/evolution.svg -+ - gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -+ - images_DATA = \ - evolution-contacts-mini.png \ - offline.png \ -@@ -407,6 +423,7 @@ - plus.png \ - minus.png - -+ - EXTRA_DIST = \ - ChangeLog \ - ChangeLog.pre-1-4 \ -@@ -423,162 +440,159 @@ - $(svgicon_DATA) \ - $(images_DATA) - -+subdir = art -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) \ -+ $(icon48_DATA) $(images_DATA) $(svgicon_DATA) -+ -+DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu art/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu art/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+icon16DATA_INSTALL = $(INSTALL_DATA) - install-icon16DATA: $(icon16_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icon16dir)" || $(MKDIR_P) "$(DESTDIR)$(icon16dir)" -+ $(mkinstalldirs) $(DESTDIR)$(icon16dir) - @list='$(icon16_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(icon16DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon16dir)/$$f'"; \ -- $(icon16DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon16dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(icon16DATA_INSTALL) $$d$$p $(DESTDIR)$(icon16dir)/$$f"; \ -+ $(icon16DATA_INSTALL) $$d$$p $(DESTDIR)$(icon16dir)/$$f; \ - done - - uninstall-icon16DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon16_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(icon16dir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icon16dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(icon16dir)/$$f"; \ -+ rm -f $(DESTDIR)$(icon16dir)/$$f; \ - done -+icon22DATA_INSTALL = $(INSTALL_DATA) - install-icon22DATA: $(icon22_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icon22dir)" || $(MKDIR_P) "$(DESTDIR)$(icon22dir)" -+ $(mkinstalldirs) $(DESTDIR)$(icon22dir) - @list='$(icon22_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(icon22DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon22dir)/$$f'"; \ -- $(icon22DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon22dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(icon22DATA_INSTALL) $$d$$p $(DESTDIR)$(icon22dir)/$$f"; \ -+ $(icon22DATA_INSTALL) $$d$$p $(DESTDIR)$(icon22dir)/$$f; \ - done - - uninstall-icon22DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon22_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(icon22dir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icon22dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(icon22dir)/$$f"; \ -+ rm -f $(DESTDIR)$(icon22dir)/$$f; \ - done -+icon24DATA_INSTALL = $(INSTALL_DATA) - install-icon24DATA: $(icon24_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icon24dir)" || $(MKDIR_P) "$(DESTDIR)$(icon24dir)" -+ $(mkinstalldirs) $(DESTDIR)$(icon24dir) - @list='$(icon24_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(icon24DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon24dir)/$$f'"; \ -- $(icon24DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon24dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(icon24DATA_INSTALL) $$d$$p $(DESTDIR)$(icon24dir)/$$f"; \ -+ $(icon24DATA_INSTALL) $$d$$p $(DESTDIR)$(icon24dir)/$$f; \ - done - - uninstall-icon24DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon24_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(icon24dir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icon24dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(icon24dir)/$$f"; \ -+ rm -f $(DESTDIR)$(icon24dir)/$$f; \ - done -+icon32DATA_INSTALL = $(INSTALL_DATA) - install-icon32DATA: $(icon32_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icon32dir)" || $(MKDIR_P) "$(DESTDIR)$(icon32dir)" -+ $(mkinstalldirs) $(DESTDIR)$(icon32dir) - @list='$(icon32_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(icon32DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon32dir)/$$f'"; \ -- $(icon32DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon32dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(icon32DATA_INSTALL) $$d$$p $(DESTDIR)$(icon32dir)/$$f"; \ -+ $(icon32DATA_INSTALL) $$d$$p $(DESTDIR)$(icon32dir)/$$f; \ - done - - uninstall-icon32DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon32_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(icon32dir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icon32dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(icon32dir)/$$f"; \ -+ rm -f $(DESTDIR)$(icon32dir)/$$f; \ - done -+icon48DATA_INSTALL = $(INSTALL_DATA) - install-icon48DATA: $(icon48_DATA) - @$(NORMAL_INSTALL) -- test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)" -+ $(mkinstalldirs) $(DESTDIR)$(icon48dir) - @list='$(icon48_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(icon48DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icon48dir)/$$f'"; \ -- $(icon48DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icon48dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(icon48DATA_INSTALL) $$d$$p $(DESTDIR)$(icon48dir)/$$f"; \ -+ $(icon48DATA_INSTALL) $$d$$p $(DESTDIR)$(icon48dir)/$$f; \ - done - - uninstall-icon48DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon48_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(icon48dir)/$$f'"; \ -- rm -f "$(DESTDIR)$(icon48dir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(icon48dir)/$$f"; \ -+ rm -f $(DESTDIR)$(icon48dir)/$$f; \ - done -+imagesDATA_INSTALL = $(INSTALL_DATA) - install-imagesDATA: $(images_DATA) - @$(NORMAL_INSTALL) -- test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)" -+ $(mkinstalldirs) $(DESTDIR)$(imagesdir) - @list='$(images_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \ -- $(imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \ -+ $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \ - done - - uninstall-imagesDATA: - @$(NORMAL_UNINSTALL) - @list='$(images_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(imagesdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(imagesdir)/$$f"; \ -+ rm -f $(DESTDIR)$(imagesdir)/$$f; \ - done -+svgiconDATA_INSTALL = $(INSTALL_DATA) - install-svgiconDATA: $(svgicon_DATA) - @$(NORMAL_INSTALL) -- test -z "$(svgicondir)" || $(MKDIR_P) "$(DESTDIR)$(svgicondir)" -+ $(mkinstalldirs) $(DESTDIR)$(svgicondir) - @list='$(svgicon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(svgiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(svgicondir)/$$f'"; \ -- $(svgiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(svgicondir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(svgiconDATA_INSTALL) $$d$$p $(DESTDIR)$(svgicondir)/$$f"; \ -+ $(svgiconDATA_INSTALL) $$d$$p $(DESTDIR)$(svgicondir)/$$f; \ - done - - uninstall-svgiconDATA: - @$(NORMAL_UNINSTALL) - @list='$(svgicon_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(svgicondir)/$$f'"; \ -- rm -f "$(DESTDIR)$(svgicondir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(svgicondir)/$$f"; \ -+ rm -f $(DESTDIR)$(svgicondir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -586,23 +600,29 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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 \ -+ $(mkinstalldirs) $(distdir)/16x16 $(distdir)/22x22 $(distdir)/24x24 $(distdir)/32x32 $(distdir)/48x48 $(distdir)/scalable -+ @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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -616,10 +636,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(icon16dir)" "$(DESTDIR)$(icon22dir)" "$(DESTDIR)$(icon24dir)" "$(DESTDIR)$(icon32dir)" "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(svgicondir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icon16dir) $(DESTDIR)$(icon22dir) $(DESTDIR)$(icon24dir) $(DESTDIR)$(icon32dir) $(DESTDIR)$(icon48dir) $(DESTDIR)$(imagesdir) $(DESTDIR)$(svgicondir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -639,7 +658,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -650,14 +669,12 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -668,20 +685,12 @@ - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - --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 -@@ -702,28 +711,23 @@ - - uninstall-am: uninstall-icon16DATA uninstall-icon22DATA \ - uninstall-icon24DATA uninstall-icon32DATA uninstall-icon48DATA \ -- uninstall-imagesDATA uninstall-svgiconDATA -+ uninstall-imagesDATA uninstall-info-am uninstall-svgiconDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook - --.MAKE: install-am install-data-am install-strip uninstall-am -- - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-data-hook install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-icon16DATA install-icon22DATA \ -- install-icon24DATA install-icon32DATA install-icon48DATA \ -- install-imagesDATA install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip install-svgiconDATA installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-hook \ -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-icon16DATA \ -+ install-icon22DATA install-icon24DATA install-icon32DATA \ -+ install-icon48DATA install-imagesDATA install-info \ -+ install-info-am install-man install-strip install-svgiconDATA \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-icon16DATA uninstall-icon22DATA uninstall-icon24DATA \ - uninstall-icon32DATA uninstall-icon48DATA uninstall-imagesDATA \ -- uninstall-svgiconDATA -+ uninstall-info-am uninstall-svgiconDATA - - - install-data-hook: update-icon-cache -diff -ruN evolution-2.12.2.orig/calendar/common/Makefile.in evolution-2.12.2/calendar/common/Makefile.in ---- evolution-2.12.2.orig/calendar/common/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/common/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,44 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/common --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libevolution_calendarprivate_la_LIBADD = --am_libevolution_calendarprivate_la_OBJECTS = authentication.lo --libevolution_calendarprivate_la_OBJECTS = \ -- $(am_libevolution_calendarprivate_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_calendarprivate_la_SOURCES) --DIST_SOURCES = $(libevolution_calendarprivate_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -101,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -112,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -137,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -162,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -170,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -228,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -252,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -276,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -284,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -291,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -300,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -322,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -352,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -371,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - noinst_LTLIBRARIES = libevolution-calendarprivate.la -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"calendar-gui\" \ - -I$(top_builddir)/shell \ -@@ -388,57 +399,62 @@ - -I$(top_srcdir)/a11y/calendar \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - libevolution_calendarprivate_la_SOURCES = \ - authentication.c \ - authentication.h - -+subdir = calendar/common -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libevolution_calendarprivate_la_LDFLAGS = -+libevolution_calendarprivate_la_LIBADD = -+am_libevolution_calendarprivate_la_OBJECTS = authentication.lo -+libevolution_calendarprivate_la_OBJECTS = \ -+ $(am_libevolution_calendarprivate_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/authentication.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_calendarprivate_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_calendarprivate_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/common/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/common/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-calendarprivate.la: $(libevolution_calendarprivate_la_OBJECTS) $(libevolution_calendarprivate_la_DEPENDENCIES) -- $(LINK) $(libevolution_calendarprivate_la_OBJECTS) $(libevolution_calendarprivate_la_LIBADD) $(LIBS) -+ $(LINK) $(libevolution_calendarprivate_la_LDFLAGS) $(libevolution_calendarprivate_la_OBJECTS) $(libevolution_calendarprivate_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -446,25 +462,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authentication.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -472,6 +500,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -480,7 +520,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -492,11 +531,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -519,23 +557,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -549,6 +592,7 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: - install: install-am - install-exec: install-exec-am -@@ -569,7 +613,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -583,34 +627,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: - --install-dvi: install-dvi-am -- - install-exec-am: - --install-html: install-html-am -- - install-info: install-info-am - - install-man: - --install-pdf: install-pdf-am -- --install-ps: install-ps-am -- - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -631,22 +665,18 @@ - - 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 \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-info install-info-am install-man \ - install-strip installcheck 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 -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool 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 -ruN evolution-2.12.2.orig/calendar/conduits/calendar/Makefile.in evolution-2.12.2/calendar/conduits/calendar/Makefile.in ---- evolution-2.12.2.orig/calendar/conduits/calendar/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/calendar/conduits/calendar/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,64 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/conduits/calendar --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privconduitdir)" \ -- "$(DESTDIR)$(conduitdir)" --privconduitLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privconduit_LTLIBRARIES) --am__DEPENDENCIES_1 = --libecalendar_conduit_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/e-util/libeconduit.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ -- $(am__DEPENDENCIES_1) --am_libecalendar_conduit_la_OBJECTS = calendar-conduit.lo --libecalendar_conduit_la_OBJECTS = \ -- $(am_libecalendar_conduit_la_OBJECTS) --libecalendar_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libecalendar_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libecalendar_conduit_la_SOURCES) --DIST_SOURCES = $(libecalendar_conduit_la_SOURCES) --conduitDATA_INSTALL = $(INSTALL_DATA) --DATA = $(conduit_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -122,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -133,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -158,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -183,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -191,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -249,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -273,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -297,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -305,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -312,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -321,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -343,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -373,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -392,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)/e-util \ -@@ -410,10 +399,13 @@ - - # Calendar Conduit - privconduit_LTLIBRARIES = libecalendar_conduit.la -+ - libecalendar_conduit_la_SOURCES = \ - calendar-conduit.c - -+ - libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - libecalendar_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ -@@ -421,79 +413,91 @@ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - -+ - conduitdir = $(datadir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit -+ - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - e-calendar.conduit.in - -+subdir = calendar/conduits/calendar -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privconduit_LTLIBRARIES) -+ -+libecalendar_conduit_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/e-util/libeconduit.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la -+am_libecalendar_conduit_la_OBJECTS = calendar-conduit.lo -+libecalendar_conduit_la_OBJECTS = $(am_libecalendar_conduit_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-conduit.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libecalendar_conduit_la_SOURCES) -+DATA = $(conduit_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libecalendar_conduit_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/calendar/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/conduits/calendar/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privconduitLTLIBRARIES_INSTALL = $(INSTALL) - install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ - else :; fi; \ - done - - uninstall-privconduitLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ - done - - clean-privconduitLTLIBRARIES: - -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libecalendar_conduit.la: $(libecalendar_conduit_la_OBJECTS) $(libecalendar_conduit_la_DEPENDENCIES) -- $(libecalendar_conduit_la_LINK) -rpath $(privconduitdir) $(libecalendar_conduit_la_OBJECTS) $(libecalendar_conduit_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privconduitdir) $(libecalendar_conduit_la_LDFLAGS) $(libecalendar_conduit_la_OBJECTS) $(libecalendar_conduit_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -501,49 +505,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-conduit.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+conduitDATA_INSTALL = $(INSTALL_DATA) - install-conduitDATA: $(conduit_DATA) - @$(NORMAL_INSTALL) -- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(conduitdir) - @list='$(conduit_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ -- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ -+ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ - done - - uninstall-conduitDATA: - @$(NORMAL_UNINSTALL) - @list='$(conduit_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ -+ rm -f $(DESTDIR)$(conduitdir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -552,7 +581,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -564,11 +592,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -591,23 +618,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -625,10 +657,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -650,7 +681,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -665,34 +696,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-conduitDATA install-privconduitLTLIBRARIES - --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 -@@ -713,25 +734,21 @@ - - ps-am: - --uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-conduitDATA uninstall-info-am \ -+ uninstall-privconduitLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-conduitDATA \ -- 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-privconduitLTLIBRARIES install-ps \ -- install-ps-am 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-conduitDATA \ -- uninstall-privconduitLTLIBRARIES -+ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-conduitDATA install-data install-data-am \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ -+ uninstall-info-am uninstall-privconduitLTLIBRARIES - - - e-calendar.conduit: e-calendar.conduit.in -diff -ruN evolution-2.12.2.orig/calendar/conduits/common/Makefile.in evolution-2.12.2/calendar/conduits/common/Makefile.in ---- evolution-2.12.2.orig/calendar/conduits/common/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/calendar/conduits/common/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,64 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/conduits/common --DIST_COMMON = $(ecalendar_common_conduitinclude_HEADERS) \ -- $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privconduitdir)" \ -- "$(DESTDIR)$(ecalendar_common_conduitincludedir)" --privconduitLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privconduit_LTLIBRARIES) --am__DEPENDENCIES_1 = --libecalendar_common_conduit_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/e-util/libeconduit.la $(am__DEPENDENCIES_1) --am_libecalendar_common_conduit_la_OBJECTS = \ -- libecalendar-common-conduit.lo --libecalendar_common_conduit_la_OBJECTS = \ -- $(am_libecalendar_common_conduit_la_OBJECTS) --libecalendar_common_conduit_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(libecalendar_common_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libecalendar_common_conduit_la_SOURCES) --DIST_SOURCES = $(libecalendar_common_conduit_la_SOURCES) --ecalendar_common_conduitincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(ecalendar_common_conduitinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -122,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -133,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -158,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -183,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -191,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -249,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -273,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -297,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -305,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -312,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -321,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -343,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -373,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -392,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)/e-util \ -@@ -406,84 +395,98 @@ - - # Calendar Conduit library - privconduit_LTLIBRARIES = libecalendar_common_conduit.la -+ - ecalendar_common_conduitincludedir = $(privincludedir)/calendar/conduits/common -+ - ecalendar_common_conduitinclude_HEADERS = \ - libecalendar-common-conduit.h - -+ - libecalendar_common_conduit_la_SOURCES = \ - libecalendar-common-conduit.c - -+ - libecalendar_common_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - libecalendar_common_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - -+subdir = calendar/conduits/common -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privconduit_LTLIBRARIES) -+ -+libecalendar_common_conduit_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/e-util/libeconduit.la -+am_libecalendar_common_conduit_la_OBJECTS = \ -+ libecalendar-common-conduit.lo -+libecalendar_common_conduit_la_OBJECTS = \ -+ $(am_libecalendar_common_conduit_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libecalendar-common-conduit.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libecalendar_common_conduit_la_SOURCES) -+HEADERS = $(ecalendar_common_conduitinclude_HEADERS) -+ -+DIST_COMMON = $(ecalendar_common_conduitinclude_HEADERS) \ -+ $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libecalendar_common_conduit_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/common/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/conduits/common/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privconduitLTLIBRARIES_INSTALL = $(INSTALL) - install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ - else :; fi; \ - done - - uninstall-privconduitLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ - done - - clean-privconduitLTLIBRARIES: - -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libecalendar_common_conduit.la: $(libecalendar_common_conduit_la_OBJECTS) $(libecalendar_common_conduit_la_DEPENDENCIES) -- $(libecalendar_common_conduit_la_LINK) -rpath $(privconduitdir) $(libecalendar_common_conduit_la_OBJECTS) $(libecalendar_common_conduit_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privconduitdir) $(libecalendar_common_conduit_la_LDFLAGS) $(libecalendar_common_conduit_la_OBJECTS) $(libecalendar_common_conduit_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -491,49 +494,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libecalendar-common-conduit.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ecalendar_common_conduitincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-ecalendar_common_conduitincludeHEADERS: $(ecalendar_common_conduitinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(ecalendar_common_conduitincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ecalendar_common_conduitincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(ecalendar_common_conduitincludedir) - @list='$(ecalendar_common_conduitinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(ecalendar_common_conduitincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f'"; \ -- $(ecalendar_common_conduitincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(ecalendar_common_conduitincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ -+ $(ecalendar_common_conduitincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f; \ - done - - uninstall-ecalendar_common_conduitincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(ecalendar_common_conduitinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(ecalendar_common_conduitincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -542,7 +570,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -554,11 +581,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -581,23 +607,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -611,10 +642,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(ecalendar_common_conduitincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(ecalendar_common_conduitincludedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -634,7 +664,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -648,14 +678,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -663,20 +691,12 @@ - install-data-am: install-ecalendar_common_conduitincludeHEADERS \ - install-privconduitLTLIBRARIES - --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 -@@ -698,25 +718,22 @@ - ps-am: - - uninstall-am: uninstall-ecalendar_common_conduitincludeHEADERS \ -- uninstall-privconduitLTLIBRARIES -- --.MAKE: install-am install-strip -+ uninstall-info-am uninstall-privconduitLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privconduitLTLIBRARIES 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-ecalendar_common_conduitincludeHEADERS \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-privconduitLTLIBRARIES install-ps \ -- install-ps-am 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-ecalendar_common_conduitincludeHEADERS \ -- uninstall-privconduitLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am \ -+ install-ecalendar_common_conduitincludeHEADERS install-exec \ -+ install-exec-am install-info install-info-am install-man \ -+ install-privconduitLTLIBRARIES 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-ecalendar_common_conduitincludeHEADERS \ -+ uninstall-info-am uninstall-privconduitLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/calendar/conduits/Makefile.in evolution-2.12.2/calendar/conduits/Makefile.in ---- evolution-2.12.2.orig/calendar/conduits/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/conduits/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/conduits --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = common calendar memo todo -+subdir = calendar/conduits -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/conduits/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/calendar/conduits/memo/Makefile.in evolution-2.12.2/calendar/conduits/memo/Makefile.in ---- evolution-2.12.2.orig/calendar/conduits/memo/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/calendar/conduits/memo/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/conduits/memo --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privconduitdir)" \ -- "$(DESTDIR)$(conduitdir)" --privconduitLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privconduit_LTLIBRARIES) --am__DEPENDENCIES_1 = --libememo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/e-util/libeconduit.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ -- $(am__DEPENDENCIES_1) --am_libememo_conduit_la_OBJECTS = memo-conduit.lo --libememo_conduit_la_OBJECTS = $(am_libememo_conduit_la_OBJECTS) --libememo_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libememo_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libememo_conduit_la_SOURCES) --DIST_SOURCES = $(libememo_conduit_la_SOURCES) --conduitDATA_INSTALL = $(INSTALL_DATA) --DATA = $(conduit_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)/e-util \ -@@ -408,10 +399,13 @@ - - # Memo Conduit - privconduit_LTLIBRARIES = libememo_conduit.la -+ - libememo_conduit_la_SOURCES = \ - memo-conduit.c - -+ - libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - libememo_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ -@@ -419,79 +413,90 @@ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - -+ - conduitdir = $(datadir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit -+ - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - e-memo.conduit.in - -+subdir = calendar/conduits/memo -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privconduit_LTLIBRARIES) -+ -+libememo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/e-util/libeconduit.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la -+am_libememo_conduit_la_OBJECTS = memo-conduit.lo -+libememo_conduit_la_OBJECTS = $(am_libememo_conduit_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/memo-conduit.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libememo_conduit_la_SOURCES) -+DATA = $(conduit_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libememo_conduit_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/memo/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/conduits/memo/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privconduitLTLIBRARIES_INSTALL = $(INSTALL) - install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ - else :; fi; \ - done - - uninstall-privconduitLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ - done - - clean-privconduitLTLIBRARIES: - -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libememo_conduit.la: $(libememo_conduit_la_OBJECTS) $(libememo_conduit_la_DEPENDENCIES) -- $(libememo_conduit_la_LINK) -rpath $(privconduitdir) $(libememo_conduit_la_OBJECTS) $(libememo_conduit_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privconduitdir) $(libememo_conduit_la_LDFLAGS) $(libememo_conduit_la_OBJECTS) $(libememo_conduit_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -499,49 +504,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memo-conduit.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+conduitDATA_INSTALL = $(INSTALL_DATA) - install-conduitDATA: $(conduit_DATA) - @$(NORMAL_INSTALL) -- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(conduitdir) - @list='$(conduit_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ -- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ -+ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ - done - - uninstall-conduitDATA: - @$(NORMAL_UNINSTALL) - @list='$(conduit_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ -+ rm -f $(DESTDIR)$(conduitdir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -550,7 +580,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -562,11 +591,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -589,23 +617,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -623,10 +656,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -648,7 +680,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -663,34 +695,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-conduitDATA install-privconduitLTLIBRARIES - --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 -@@ -711,25 +733,21 @@ - - ps-am: - --uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-conduitDATA uninstall-info-am \ -+ uninstall-privconduitLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-conduitDATA \ -- 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-privconduitLTLIBRARIES install-ps \ -- install-ps-am 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-conduitDATA \ -- uninstall-privconduitLTLIBRARIES -+ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-conduitDATA install-data install-data-am \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ -+ uninstall-info-am uninstall-privconduitLTLIBRARIES - - - e-memo.conduit: e-memo.conduit.in -diff -ruN evolution-2.12.2.orig/calendar/conduits/todo/Makefile.in evolution-2.12.2/calendar/conduits/todo/Makefile.in ---- evolution-2.12.2.orig/calendar/conduits/todo/Makefile.in 2007-12-05 15:50:02.000000000 +0100 -+++ evolution-2.12.2/calendar/conduits/todo/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/conduits/todo --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privconduitdir)" \ -- "$(DESTDIR)$(conduitdir)" --privconduitLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privconduit_LTLIBRARIES) --am__DEPENDENCIES_1 = --libetodo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/e-util/libeconduit.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ -- $(am__DEPENDENCIES_1) --am_libetodo_conduit_la_OBJECTS = todo-conduit.lo --libetodo_conduit_la_OBJECTS = $(am_libetodo_conduit_la_OBJECTS) --libetodo_conduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libetodo_conduit_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libetodo_conduit_la_SOURCES) --DIST_SOURCES = $(libetodo_conduit_la_SOURCES) --conduitDATA_INSTALL = $(INSTALL_DATA) --DATA = $(conduit_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)/e-util \ -@@ -408,10 +399,13 @@ - - # ToDo Conduit - privconduit_LTLIBRARIES = libetodo_conduit.la -+ - libetodo_conduit_la_SOURCES = \ - todo-conduit.c - -+ - libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - libetodo_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ -@@ -419,79 +413,90 @@ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - -+ - conduitdir = $(datadir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit -+ - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - e-todo.conduit.in - -+subdir = calendar/conduits/todo -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privconduit_LTLIBRARIES) -+ -+libetodo_conduit_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/e-util/libeconduit.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la -+am_libetodo_conduit_la_OBJECTS = todo-conduit.lo -+libetodo_conduit_la_OBJECTS = $(am_libetodo_conduit_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/todo-conduit.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libetodo_conduit_la_SOURCES) -+DATA = $(conduit_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libetodo_conduit_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/conduits/todo/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/conduits/todo/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privconduitLTLIBRARIES_INSTALL = $(INSTALL) - install-privconduitLTLIBRARIES: $(privconduit_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privconduitdir)" || $(MKDIR_P) "$(DESTDIR)$(privconduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privconduitdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privconduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privconduitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privconduitdir)/$$f; \ - else :; fi; \ - done - - uninstall-privconduitLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privconduitdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privconduitdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privconduitdir)/$$p; \ - done - - clean-privconduitLTLIBRARIES: - -test -z "$(privconduit_LTLIBRARIES)" || rm -f $(privconduit_LTLIBRARIES) - @list='$(privconduit_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libetodo_conduit.la: $(libetodo_conduit_la_OBJECTS) $(libetodo_conduit_la_DEPENDENCIES) -- $(libetodo_conduit_la_LINK) -rpath $(privconduitdir) $(libetodo_conduit_la_OBJECTS) $(libetodo_conduit_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privconduitdir) $(libetodo_conduit_la_LDFLAGS) $(libetodo_conduit_la_OBJECTS) $(libetodo_conduit_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -499,49 +504,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/todo-conduit.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+conduitDATA_INSTALL = $(INSTALL_DATA) - install-conduitDATA: $(conduit_DATA) - @$(NORMAL_INSTALL) -- test -z "$(conduitdir)" || $(MKDIR_P) "$(DESTDIR)$(conduitdir)" -+ $(mkinstalldirs) $(DESTDIR)$(conduitdir) - @list='$(conduit_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(conduitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(conduitdir)/$$f'"; \ -- $(conduitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f"; \ -+ $(conduitDATA_INSTALL) $$d$$p $(DESTDIR)$(conduitdir)/$$f; \ - done - - uninstall-conduitDATA: - @$(NORMAL_UNINSTALL) - @list='$(conduit_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(conduitdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(conduitdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(conduitdir)/$$f"; \ -+ rm -f $(DESTDIR)$(conduitdir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -550,7 +580,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -562,11 +591,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -589,23 +617,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -623,10 +656,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privconduitdir)" "$(DESTDIR)$(conduitdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privconduitdir) $(DESTDIR)$(conduitdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -648,7 +680,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -663,34 +695,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-conduitDATA install-privconduitLTLIBRARIES - --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 -@@ -711,25 +733,21 @@ - - ps-am: - --uninstall-am: uninstall-conduitDATA uninstall-privconduitLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-conduitDATA uninstall-info-am \ -+ uninstall-privconduitLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privconduitLTLIBRARIES ctags dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-conduitDATA \ -- 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-privconduitLTLIBRARIES install-ps \ -- install-ps-am 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-conduitDATA \ -- uninstall-privconduitLTLIBRARIES -+ clean-libtool clean-privconduitLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-conduitDATA install-data install-data-am \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-privconduitLTLIBRARIES 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-conduitDATA \ -+ uninstall-info-am uninstall-privconduitLTLIBRARIES - - - e-todo.conduit: e-todo.conduit.in -diff -ruN evolution-2.12.2.orig/calendar/gui/alarm-notify/Makefile.in evolution-2.12.2/calendar/gui/alarm-notify/Makefile.in ---- evolution-2.12.2.orig/calendar/gui/alarm-notify/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/gui/alarm-notify/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,69 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --privlibexec_PROGRAMS = evolution-alarm-notify$(EXEEXT) --subdir = calendar/gui/alarm-notify --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__installdirs = "$(DESTDIR)$(privlibexecdir)" \ -- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(serverdir)" --privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --PROGRAMS = $(privlibexec_PROGRAMS) --am__objects_1 = evolution-calendar-common.$(OBJEXT) \ -- evolution-calendar-skels.$(OBJEXT) \ -- evolution-calendar-stubs.$(OBJEXT) --am__objects_2 = --am__objects_3 = $(am__objects_1) $(am__objects_2) --am_evolution_alarm_notify_OBJECTS = $(am__objects_3) alarm.$(OBJEXT) \ -- alarm-notify.$(OBJEXT) alarm-notify-dialog.$(OBJEXT) \ -- alarm-queue.$(OBJEXT) config-data.$(OBJEXT) \ -- notify-main.$(OBJEXT) util.$(OBJEXT) --evolution_alarm_notify_OBJECTS = $(am_evolution_alarm_notify_OBJECTS) --am__DEPENDENCIES_1 = --evolution_alarm_notify_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(evolution_alarm_notify_SOURCES) --DIST_SOURCES = $(evolution_alarm_notify_SOURCES) --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --gladeDATA_INSTALL = $(INSTALL_DATA) --serverDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) $(server_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -127,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -138,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -163,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -188,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -196,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -254,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -278,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -302,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -310,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -317,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -326,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -348,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -378,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -397,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - CORBA_GENERATED_H = \ - evolution-calendar.h -@@ -412,8 +396,12 @@ - evolution-calendar-stubs.c - - CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H) -+ - idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl - idl_flags = $(IDL_INCLUDES) -+ -+privlibexec_PROGRAMS = evolution-alarm-notify -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ - -I$(top_srcdir) \ -@@ -424,9 +412,11 @@ - -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - glade_DATA = \ - alarm-notify.glade - -+ - evolution_alarm_notify_SOURCES = \ - $(CORBA_GENERATED) \ - alarm.c \ -@@ -443,6 +433,7 @@ - util.c \ - util.h - -+ - evolution_alarm_notify_LDADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ -@@ -450,59 +441,86 @@ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in - server_DATA = $(server_in_files:.server.in.in=.server) -+ - EXTRA_DIST = \ - $(server_in_files) \ - $(glade_DATA) - -+ - BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = calendar/gui/alarm-notify -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+privlibexec_PROGRAMS = evolution-alarm-notify$(EXEEXT) -+PROGRAMS = $(privlibexec_PROGRAMS) -+ -+am__objects_1 = evolution-calendar-common.$(OBJEXT) \ -+ evolution-calendar-skels.$(OBJEXT) \ -+ evolution-calendar-stubs.$(OBJEXT) -+am__objects_2 = -+am__objects_3 = $(am__objects_1) $(am__objects_2) -+am_evolution_alarm_notify_OBJECTS = $(am__objects_3) alarm.$(OBJEXT) \ -+ alarm-notify.$(OBJEXT) alarm-notify-dialog.$(OBJEXT) \ -+ alarm-queue.$(OBJEXT) config-data.$(OBJEXT) \ -+ notify-main.$(OBJEXT) util.$(OBJEXT) -+evolution_alarm_notify_OBJECTS = $(am_evolution_alarm_notify_OBJECTS) -+evolution_alarm_notify_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/calendar/common/libevolution-calendarprivate.la -+evolution_alarm_notify_LDFLAGS = -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alarm-notify-dialog.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/alarm-notify.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/alarm-queue.Po ./$(DEPDIR)/alarm.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/config-data.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-common.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-skels.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-stubs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/notify-main.Po ./$(DEPDIR)/util.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(evolution_alarm_notify_SOURCES) -+DATA = $(glade_DATA) $(server_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(evolution_alarm_notify_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/gui/alarm-notify/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/gui/alarm-notify/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ - else :; fi; \ - done - -@@ -510,8 +528,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ - done - - clean-privlibexecPROGRAMS: -@@ -522,10 +540,10 @@ - done - evolution-alarm-notify$(EXEEXT): $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_DEPENDENCIES) - @rm -f evolution-alarm-notify$(EXEEXT) -- $(LINK) $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_LDADD) $(LIBS) -+ $(LINK) $(evolution_alarm_notify_LDFLAGS) $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -542,66 +560,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+serverDATA_INSTALL = $(INSTALL_DATA) - install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) -- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" -+ $(mkinstalldirs) $(DESTDIR)$(serverdir) - @list='$(server_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ -- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ -+ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ - done - - uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ -+ rm -f $(DESTDIR)$(serverdir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -610,7 +654,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -622,11 +665,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -649,23 +691,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -683,10 +730,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(PROGRAMS) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(serverdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(serverdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -708,7 +754,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -723,34 +769,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-gladeDATA install-serverDATA - --install-dvi: install-dvi-am -- - install-exec-am: install-privlibexecPROGRAMS - --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 -@@ -771,26 +807,22 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-privlibexecPROGRAMS \ -- uninstall-serverDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-privlibexecPROGRAMS uninstall-serverDATA - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privlibexecPROGRAMS ctags dist-hook \ -- 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-gladeDATA install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-privlibexecPROGRAMS install-ps \ -- install-ps-am install-serverDATA 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-gladeDATA \ -- uninstall-privlibexecPROGRAMS uninstall-serverDATA -+ clean-libtool clean-privlibexecPROGRAMS ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-man install-privlibexecPROGRAMS install-serverDATA \ -+ 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-gladeDATA \ -+ uninstall-info-am uninstall-privlibexecPROGRAMS \ -+ uninstall-serverDATA - - - $(CORBA_GENERATED_H): $(idls) -diff -ruN evolution-2.12.2.orig/calendar/gui/dialogs/Makefile.in evolution-2.12.2/calendar/gui/dialogs/Makefile.in ---- evolution-2.12.2.orig/calendar/gui/dialogs/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/gui/dialogs/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/gui/dialogs --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libcal_dialogs_la_DEPENDENCIES = \ -- $(top_builddir)/addressbook/util/libeabutil.la --am_libcal_dialogs_la_OBJECTS = alarm-dialog.lo alarm-list-dialog.lo \ -- cal-attachment-select-file.lo cal-prefs-dialog.lo \ -- calendar-setup.lo cancel-comp.lo changed-comp.lo \ -- comp-editor.lo comp-editor-page.lo comp-editor-util.lo \ -- copy-source-dialog.lo delete-comp.lo delete-error.lo \ -- e-delegate-dialog.lo e-send-options-utils.lo event-editor.lo \ -- event-page.lo memo-editor.lo memo-page.lo recurrence-page.lo \ -- recur-comp.lo save-comp.lo schedule-page.lo \ -- select-source-dialog.lo send-comp.lo task-editor.lo \ -- task-details-page.lo task-page.lo --libcal_dialogs_la_OBJECTS = $(am_libcal_dialogs_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libcal_dialogs_la_SOURCES) --DIST_SOURCES = $(libcal_dialogs_la_SOURCES) --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(gladedir)" --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DG_LOG_DOMAIN=\"calendar-gui\" \ -@@ -411,10 +402,13 @@ - -DPREFIX=\""$(prefix)"\" \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - noinst_LTLIBRARIES = libcal-dialogs.la -+ - libcal_dialogs_la_LIBADD = \ - $(top_builddir)/addressbook/util/libeabutil.la - -+ - libcal_dialogs_la_SOURCES = \ - $(IDL_GENERATED) \ - alarm-dialog.c \ -@@ -474,6 +468,7 @@ - task-page.c \ - task-page.h - -+ - glade_DATA = \ - alarm-dialog.glade \ - alarm-list-dialog.glade \ -@@ -487,57 +482,101 @@ - task-details-page.glade \ - task-page.glade - -+ - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - $(glade_DATA) - -+subdir = calendar/gui/dialogs -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libcal_dialogs_la_LDFLAGS = -+libcal_dialogs_la_DEPENDENCIES = \ -+ $(top_builddir)/addressbook/util/libeabutil.la -+am_libcal_dialogs_la_OBJECTS = $(am__objects_1) alarm-dialog.lo \ -+ alarm-list-dialog.lo cal-attachment-select-file.lo \ -+ cal-prefs-dialog.lo calendar-setup.lo cancel-comp.lo \ -+ changed-comp.lo comp-editor.lo comp-editor-page.lo \ -+ comp-editor-util.lo copy-source-dialog.lo delete-comp.lo \ -+ delete-error.lo e-delegate-dialog.lo e-send-options-utils.lo \ -+ event-editor.lo event-page.lo memo-editor.lo memo-page.lo \ -+ recurrence-page.lo recur-comp.lo save-comp.lo schedule-page.lo \ -+ select-source-dialog.lo send-comp.lo task-editor.lo \ -+ task-details-page.lo task-page.lo -+libcal_dialogs_la_OBJECTS = $(am_libcal_dialogs_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alarm-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/alarm-list-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cal-attachment-select-file.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cal-prefs-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/calendar-setup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cancel-comp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/changed-comp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor-util.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/copy-source-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/delete-comp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/delete-error.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-delegate-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-send-options-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/event-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/event-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/memo-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/memo-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/recur-comp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/recurrence-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/save-comp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/schedule-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/select-source-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/send-comp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/task-details-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/task-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/task-page.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libcal_dialogs_la_SOURCES) -+DATA = $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libcal_dialogs_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/gui/dialogs/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/gui/dialogs/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libcal-dialogs.la: $(libcal_dialogs_la_OBJECTS) $(libcal_dialogs_la_DEPENDENCIES) -- $(LINK) $(libcal_dialogs_la_OBJECTS) $(libcal_dialogs_la_LIBADD) $(LIBS) -+ $(LINK) $(libcal_dialogs_la_LDFLAGS) $(libcal_dialogs_la_OBJECTS) $(libcal_dialogs_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -572,49 +611,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task-page.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -623,7 +687,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -635,11 +698,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -662,23 +724,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -695,10 +762,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -719,7 +785,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -733,34 +799,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-gladeDATA - --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 -@@ -781,23 +837,19 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \ -- 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-gladeDATA install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-gladeDATA -+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA 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-gladeDATA uninstall-info-am - - - dist-hook: -diff -ruN evolution-2.12.2.orig/calendar/gui/Makefile.in evolution-2.12.2/calendar/gui/Makefile.in ---- evolution-2.12.2.orig/calendar/gui/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/gui/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,127 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/gui --DIST_COMMON = $(ecalendarinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(etspecdir)" \ -- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(ruledir)" \ -- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" \ -- "$(DESTDIR)$(ecalendarincludedir)" --componentLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(component_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_calendar_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/widgets/menus/libmenus.la \ -- $(top_builddir)/shell/libeshell.la \ -- $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ -- $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ -- $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ -- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/filter/libfilter.la \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --am__objects_1 = evolution-calendar-common.lo \ -- evolution-calendar-skels.lo evolution-calendar-stubs.lo --am__objects_2 = --am__objects_3 = $(am__objects_1) $(am__objects_2) --am__objects_4 = Evolution-Composer-common.lo \ -- Evolution-Composer-skels.lo Evolution-Composer-stubs.lo --am__objects_5 = $(am__objects_4) $(am__objects_2) --am__objects_6 = $(am__objects_3) $(am__objects_5) --am__objects_7 = e-calendar-marshal.lo --am_libevolution_calendar_la_OBJECTS = $(am__objects_6) \ -- $(am__objects_7) cal-search-bar.lo calendar-config.lo \ -- calendar-commands.lo calendar-component.lo calendar-view.lo \ -- calendar-view-factory.lo comp-editor-factory.lo comp-util.lo \ -- control-factory.lo e-alarm-list.lo e-cal-component-preview.lo \ -- e-cal-component-memo-preview.lo e-cal-config.lo e-cal-event.lo \ -- e-cal-menu.lo e-cal-model-calendar.lo e-cal-model-tasks.lo \ -- e-cal-model.lo e-cal-popup.lo e-calendar-view.lo \ -- e-cal-list-view.lo e-cal-list-view-config.lo \ -- e-cal-model-memos.lo e-calendar-table.lo \ -- e-calendar-table-config.lo e-cell-date-edit-config.lo \ -- e-cell-date-edit-text.lo e-comp-editor-registry.lo \ -- e-date-edit-config.lo e-date-time-list.lo e-day-view-config.lo \ -- e-day-view-layout.lo e-day-view-main-item.lo \ -- e-day-view-time-item.lo e-day-view-top-item.lo e-day-view.lo \ -- e-itip-control.lo e-meeting-attendee.lo e-meeting-list-view.lo \ -- e-meeting-store.lo e-meeting-time-sel.lo \ -- e-meeting-time-sel-item.lo e-meeting-utils.lo e-memo-table.lo \ -- e-memo-table-config.lo e-memos.lo e-mini-calendar-config.lo \ -- e-select-names-editable.lo e-select-names-renderer.lo \ -- e-week-view-config.lo e-week-view-event-item.lo \ -- e-week-view-layout.lo e-week-view-main-item.lo \ -- e-week-view-titles-item.lo e-week-view.lo e-tasks.lo \ -- e-timezone-entry.lo gnome-cal.lo goto.lo \ -- itip-bonobo-control.lo itip-utils.lo main.lo \ -- memos-component.lo memos-control.lo migration.lo misc.lo \ -- print.lo tag-calendar.lo tasks-component.lo tasks-control.lo \ -- weekday-picker.lo --libevolution_calendar_la_OBJECTS = \ -- $(am_libevolution_calendar_la_OBJECTS) --libevolution_calendar_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_calendar_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_calendar_la_SOURCES) --DIST_SOURCES = $(libevolution_calendar_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 --etspecDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --ruleDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --serverDATA_INSTALL = $(INSTALL_DATA) --DATA = $(etspec_DATA) $(glade_DATA) $(rule_DATA) $(schema_DATA) \ -- $(server_DATA) --ecalendarincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(ecalendarinclude_HEADERS) --RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -- distclean-recursive maintainer-clean-recursive --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -186,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -197,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -222,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -247,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -255,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -313,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -337,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -361,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -369,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -376,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -385,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -407,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -437,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -456,17 +384,16 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la -+ - IDLS = \ - $(top_srcdir)/composer/Evolution-Composer.idl \ - $(top_srcdir)/calendar/idl/evolution-calendar.idl - -+ - CALENDAR_IDL_GENERATED_H = \ - evolution-calendar.h - -@@ -477,6 +404,7 @@ - - CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H) - -+ - # Message composer IDL files - COMPOSER_IDL_GENERATED_H = \ - Evolution-Composer.h -@@ -487,19 +415,27 @@ - Evolution-Composer-stubs.c - - COMPOSER_IDL_GENERATED = $(COMPOSER_IDL_GENERATED_C) $(COMPOSER_IDL_GENERATED_H) -+ - IDL_GENERATED = $(CALENDAR_IDL_GENERATED) $(COMPOSER_IDL_GENERATED) - - # The marshallers - MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h -+ - SUBDIRS = alarm-notify dialogs -+ - component_LTLIBRARIES = libevolution-calendar.la -+ - ecalendarincludedir = $(privincludedir)/calendar/gui -+ - ecalendarinclude_HEADERS = \ - e-cal-config.h - -+ - search_files = tasktypes.xml memotypes.xml caltypes.xml -+ - ruledir = $(privdatadir) - rule_DATA = $(search_files) -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"calendar-gui\" \ - -I$(top_builddir)/shell \ -@@ -518,16 +454,19 @@ - $(LIBSOUP_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - glade_DATA = \ - e-itip-control.glade \ - goto-dialog.glade - -+ - etspec_DATA = \ - e-calendar-table.etspec \ - e-meeting-time-sel.etspec \ - e-cal-list-view.etspec \ - e-memo-table.etspec - -+ - libevolution_calendar_la_SOURCES = \ - $(IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ -@@ -676,6 +615,7 @@ - weekday-picker.c \ - weekday-picker.h - -+ - libevolution_calendar_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/widgets/menus/libmenus.la \ -@@ -692,14 +632,18 @@ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) -+ - server_in_files = GNOME_Evolution_Calendar.server.in.in - server_DATA = $(server_in_files:.server.in.in=.server) - -+ - # GConf schemas - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = apps_evolution_calendar.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - EXTRA_DIST = \ - e-calendar-marshal.list \ - $(glade_DATA) \ -@@ -708,75 +652,224 @@ - $(server_in_files) \ - $(search_files) - -+ - BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+subdir = calendar/gui -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(component_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libevolution_calendar_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-mail.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/menus/libmenus.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/shell/libeshell.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/filter/libfilter.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la -+@OS_WIN32_FALSE@libevolution_calendar_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/menus/libmenus.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/shell/libeshell.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/filter/libfilter.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la -+am__objects_1 = evolution-calendar-common.lo evolution-calendar-skels.lo \ -+ evolution-calendar-stubs.lo -+am__objects_2 = -+am__objects_3 = $(am__objects_1) $(am__objects_2) -+am__objects_4 = Evolution-Composer-common.lo Evolution-Composer-skels.lo \ -+ Evolution-Composer-stubs.lo -+am__objects_5 = $(am__objects_4) $(am__objects_2) -+am__objects_6 = $(am__objects_3) $(am__objects_5) -+am__objects_7 = e-calendar-marshal.lo -+am_libevolution_calendar_la_OBJECTS = $(am__objects_6) $(am__objects_7) \ -+ cal-search-bar.lo calendar-config.lo calendar-commands.lo \ -+ calendar-component.lo calendar-view.lo calendar-view-factory.lo \ -+ comp-editor-factory.lo comp-util.lo control-factory.lo \ -+ e-alarm-list.lo e-cal-component-preview.lo \ -+ e-cal-component-memo-preview.lo e-cal-config.lo e-cal-event.lo \ -+ e-cal-menu.lo e-cal-model-calendar.lo e-cal-model-tasks.lo \ -+ e-cal-model.lo e-cal-popup.lo e-calendar-view.lo \ -+ e-cal-list-view.lo e-cal-list-view-config.lo \ -+ e-cal-model-memos.lo e-calendar-table.lo \ -+ e-calendar-table-config.lo e-cell-date-edit-config.lo \ -+ e-cell-date-edit-text.lo e-comp-editor-registry.lo \ -+ e-date-edit-config.lo e-date-time-list.lo e-day-view-config.lo \ -+ e-day-view-layout.lo e-day-view-main-item.lo \ -+ e-day-view-time-item.lo e-day-view-top-item.lo e-day-view.lo \ -+ e-itip-control.lo e-meeting-attendee.lo e-meeting-list-view.lo \ -+ e-meeting-store.lo e-meeting-time-sel.lo \ -+ e-meeting-time-sel-item.lo e-meeting-utils.lo e-memo-table.lo \ -+ e-memo-table-config.lo e-memos.lo e-mini-calendar-config.lo \ -+ e-select-names-editable.lo e-select-names-renderer.lo \ -+ e-week-view-config.lo e-week-view-event-item.lo \ -+ e-week-view-layout.lo e-week-view-main-item.lo \ -+ e-week-view-titles-item.lo e-week-view.lo e-tasks.lo \ -+ e-timezone-entry.lo gnome-cal.lo goto.lo itip-bonobo-control.lo \ -+ itip-utils.lo main.lo memos-component.lo memos-control.lo \ -+ migration.lo misc.lo print.lo tag-calendar.lo \ -+ tasks-component.lo tasks-control.lo weekday-picker.lo -+libevolution_calendar_la_OBJECTS = \ -+ $(am_libevolution_calendar_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-Composer-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Composer-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cal-search-bar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/calendar-commands.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/calendar-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/calendar-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/calendar-view-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/calendar-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/comp-editor-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/comp-util.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/control-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-alarm-list.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-component-memo-preview.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-component-preview.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-event.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-list-view-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-list-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-menu.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model-memos.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model-tasks.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cal-popup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-table-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-table.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date-edit-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date-edit-text.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-comp-editor-registry.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-date-edit-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-date-time-list.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-layout.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-main-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-time-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view-top-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-day-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-itip-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-attendee.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-list-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-store.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-time-sel-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-time-sel.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-meeting-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-memo-table-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-memo-table.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-memos.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-mini-calendar-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-select-names-editable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-select-names-renderer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tasks.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-timezone-entry.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-event-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-layout.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-main-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view-titles-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-week-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-calendar-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gnome-cal.Plo ./$(DEPDIR)/goto.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/itip-bonobo-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/itip-utils.Plo ./$(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/memos-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/memos-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/migration.Plo ./$(DEPDIR)/misc.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/print.Plo ./$(DEPDIR)/tag-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/tasks-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/tasks-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/weekday-picker.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_calendar_la_SOURCES) -+DATA = $(etspec_DATA) $(glade_DATA) $(rule_DATA) $(schema_DATA) \ -+ $(server_DATA) -+ -+HEADERS = $(ecalendarinclude_HEADERS) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(ecalendarinclude_HEADERS) $(srcdir)/Makefile.in \ -+ Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) -+SOURCES = $(libevolution_calendar_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/gui/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/gui/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+componentLTLIBRARIES_INSTALL = $(INSTALL) - install-componentLTLIBRARIES: $(component_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ - else :; fi; \ - done - - uninstall-componentLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ - done - - clean-componentLTLIBRARIES: - -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-calendar.la: $(libevolution_calendar_la_OBJECTS) $(libevolution_calendar_la_DEPENDENCIES) -- $(libevolution_calendar_la_LINK) -rpath $(componentdir) $(libevolution_calendar_la_OBJECTS) $(libevolution_calendar_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(componentdir) $(libevolution_calendar_la_LDFLAGS) $(libevolution_calendar_la_OBJECTS) $(libevolution_calendar_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -861,132 +954,154 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weekday-picker.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+etspecDATA_INSTALL = $(INSTALL_DATA) - install-etspecDATA: $(etspec_DATA) - @$(NORMAL_INSTALL) -- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(etspecdir) - @list='$(etspec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ -- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ -+ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ - done - - uninstall-etspecDATA: - @$(NORMAL_UNINSTALL) - @list='$(etspec_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(etspecdir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+ruleDATA_INSTALL = $(INSTALL_DATA) - install-ruleDATA: $(rule_DATA) - @$(NORMAL_INSTALL) -- test -z "$(ruledir)" || $(MKDIR_P) "$(DESTDIR)$(ruledir)" -+ $(mkinstalldirs) $(DESTDIR)$(ruledir) - @list='$(rule_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(ruleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ruledir)/$$f'"; \ -- $(ruleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ruledir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f"; \ -+ $(ruleDATA_INSTALL) $$d$$p $(DESTDIR)$(ruledir)/$$f; \ - done - - uninstall-ruleDATA: - @$(NORMAL_UNINSTALL) - @list='$(rule_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(ruledir)/$$f'"; \ -- rm -f "$(DESTDIR)$(ruledir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(ruledir)/$$f"; \ -+ rm -f $(DESTDIR)$(ruledir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done -+serverDATA_INSTALL = $(INSTALL_DATA) - install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) -- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" -+ $(mkinstalldirs) $(DESTDIR)$(serverdir) - @list='$(server_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ -- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ -+ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ - done - - uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ -+ rm -f $(DESTDIR)$(serverdir)/$$f; \ - done -+ecalendarincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-ecalendarincludeHEADERS: $(ecalendarinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(ecalendarincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ecalendarincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(ecalendarincludedir) - @list='$(ecalendarinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(ecalendarincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ecalendarincludedir)/$$f'"; \ -- $(ecalendarincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ecalendarincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(ecalendarincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendarincludedir)/$$f"; \ -+ $(ecalendarincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ecalendarincludedir)/$$f; \ - done - - uninstall-ecalendarincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(ecalendarinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(ecalendarincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(ecalendarincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(ecalendarincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(ecalendarincludedir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -996,13 +1111,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1014,20 +1123,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1048,7 +1152,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1059,6 +1163,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -1067,22 +1179,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -1092,11 +1201,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -1119,23 +1227,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -1146,19 +1259,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -1172,9 +1281,8 @@ - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(ruledir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(ecalendarincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(etspecdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(ruledir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) $(DESTDIR)$(ecalendarincludedir) -+ - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -1196,7 +1304,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -1212,14 +1320,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: -@@ -1229,20 +1335,12 @@ - install-gladeDATA install-ruleDATA install-schemaDATA \ - install-serverDATA - --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 -@@ -1265,32 +1363,34 @@ - - uninstall-am: uninstall-componentLTLIBRARIES \ - uninstall-ecalendarincludeHEADERS uninstall-etspecDATA \ -- uninstall-gladeDATA uninstall-ruleDATA uninstall-schemaDATA \ -- uninstall-serverDATA -+ uninstall-gladeDATA uninstall-info-am uninstall-ruleDATA \ -+ uninstall-schemaDATA uninstall-serverDATA - --.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-componentLTLIBRARIES \ -- clean-generic clean-libtool ctags ctags-recursive dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-componentLTLIBRARIES clean-generic clean-libtool \ -+ clean-recursive ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ - install-componentLTLIBRARIES install-data install-data-am \ -- install-data-local install-dvi install-dvi-am \ -- install-ecalendarincludeHEADERS install-etspecDATA \ -- install-exec install-exec-am install-gladeDATA install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-ruleDATA install-schemaDATA install-serverDATA \ -- 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-componentLTLIBRARIES \ -+ install-data-local install-data-recursive \ -+ install-ecalendarincludeHEADERS install-etspecDATA install-exec \ -+ install-exec-am install-exec-recursive install-gladeDATA \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-ruleDATA install-schemaDATA \ -+ install-serverDATA install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am \ -+ uninstall-componentLTLIBRARIES \ - uninstall-ecalendarincludeHEADERS uninstall-etspecDATA \ -- uninstall-gladeDATA uninstall-ruleDATA uninstall-schemaDATA \ -+ uninstall-gladeDATA uninstall-info-am uninstall-info-recursive \ -+ uninstall-recursive uninstall-ruleDATA uninstall-schemaDATA \ - uninstall-serverDATA - - -diff -ruN evolution-2.12.2.orig/calendar/idl/Makefile.in evolution-2.12.2/calendar/idl/Makefile.in ---- evolution-2.12.2.orig/calendar/idl/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/idl/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/idl --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(idldir)" --idlDATA_INSTALL = $(INSTALL_DATA) --DATA = $(idl_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,72 +384,60 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - idl_DATA = \ - evolution-calendar.idl - -+ - EXTRA_DIST = \ - $(idl_DATA) - -+subdir = calendar/idl -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(idl_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/idl/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/idl/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+idlDATA_INSTALL = $(INSTALL_DATA) - install-idlDATA: $(idl_DATA) - @$(NORMAL_INSTALL) -- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" -+ $(mkinstalldirs) $(DESTDIR)$(idldir) - @list='$(idl_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ -- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ -+ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ - done - - uninstall-idlDATA: - @$(NORMAL_UNINSTALL) - @list='$(idl_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ -+ rm -f $(DESTDIR)$(idldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -434,23 +445,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +480,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(idldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(idldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -487,7 +502,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -498,34 +513,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-idlDATA - --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,21 +549,17 @@ - - ps-am: - --uninstall-am: uninstall-idlDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-idlDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-idlDATA install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-idlDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-idlDATA \ -+ install-info install-info-am install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-idlDATA 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 -ruN evolution-2.12.2.orig/calendar/importers/Makefile.in evolution-2.12.2/calendar/importers/Makefile.in ---- evolution-2.12.2.orig/calendar/importers/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/importers/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar/importers --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_calendar_importers_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ -- $(am__DEPENDENCIES_1) --am_libevolution_calendar_importers_la_OBJECTS = icalendar-importer.lo --libevolution_calendar_importers_la_OBJECTS = \ -- $(am_libevolution_calendar_importers_la_OBJECTS) --libevolution_calendar_importers_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_calendar_importers_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_calendar_importers_la_SOURCES) --DIST_SOURCES = $(libevolution_calendar_importers_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - privsolib_LTLIBRARIES = libevolution-calendar-importers.la -+ - INCLUDES = \ - -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ - -DG_LOG_DOMAIN=\"Evolution-Importer\" \ -@@ -402,81 +397,90 @@ - -I$(top_builddir)/calendar \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - libevolution_calendar_importers_la_SOURCES = \ - evolution-calendar-importer.h \ - icalendar-importer.c - -+ - libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) -+ - libevolution_calendar_importers_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ - $(EVOLUTION_CALENDAR_LIBS) - -+subdir = calendar/importers -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libevolution_calendar_importers_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/calendar/common/libevolution-calendarprivate.la -+am_libevolution_calendar_importers_la_OBJECTS = icalendar-importer.lo -+libevolution_calendar_importers_la_OBJECTS = \ -+ $(am_libevolution_calendar_importers_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/icalendar-importer.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_calendar_importers_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_calendar_importers_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/importers/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/importers/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-calendar-importers.la: $(libevolution_calendar_importers_la_OBJECTS) $(libevolution_calendar_importers_la_DEPENDENCIES) -- $(libevolution_calendar_importers_la_LINK) -rpath $(privsolibdir) $(libevolution_calendar_importers_la_OBJECTS) $(libevolution_calendar_importers_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_calendar_importers_la_LDFLAGS) $(libevolution_calendar_importers_la_OBJECTS) $(libevolution_calendar_importers_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -484,25 +488,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icalendar-importer.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -510,6 +526,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -518,7 +546,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -530,11 +557,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -557,23 +583,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -587,10 +618,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -610,7 +640,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -624,34 +654,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -672,23 +692,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/calendar/Makefile.in evolution-2.12.2/calendar/Makefile.in ---- evolution-2.12.2.orig/calendar/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/calendar/Makefile.in 2007-12-05 15:54:52.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,47 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = calendar --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS \ -- ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(errordir)" --errorDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) --RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -- distclean-recursive maintainer-clean-recursive --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = idl common importers gui conduits --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -104,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -115,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -140,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -165,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -173,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -231,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -255,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -279,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -287,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -294,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -303,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -325,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -355,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -374,80 +384,79 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ --@ENABLE_PILOT_CONDUITS_FALSE@CONDUIT_DIR = - @ENABLE_PILOT_CONDUITS_TRUE@CONDUIT_DIR = conduits -+@ENABLE_PILOT_CONDUITS_FALSE@CONDUIT_DIR = -+ - SUBDIRS = idl common importers gui $(CONDUIT_DIR) -+ - error_DATA = calendar.error - errordir = $(privdatadir)/errors -+ - EXTRA_DIST = \ - calendar.error.xml \ - ChangeLog.pre-1-4 \ - $(error_DATA) \ - zones.h - -+ - BUILT_SOURCES = $(error_DATA) -+ - CLEANFILES = $(BUILT_SOURCES) -+subdir = calendar -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(error_DATA) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in AUTHORS ChangeLog Makefile.am -+DIST_SUBDIRS = idl common importers gui conduits - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu calendar/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu calendar/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -457,13 +466,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -475,20 +478,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -509,7 +507,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -520,6 +518,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -528,22 +534,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -553,11 +556,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -580,23 +582,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -609,17 +616,13 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -633,9 +636,8 @@ - all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(errordir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(errordir) -+ - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -657,7 +659,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -669,34 +671,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: install-errorDATA - --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 -@@ -715,24 +708,26 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA -+uninstall-am: uninstall-errorDATA 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 dist-hook distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-errorDATA \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am uninstall-errorDATA -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-errorDATA install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-errorDATA \ -+ uninstall-info-am uninstall-info-recursive uninstall-recursive - - @EVO_PLUGIN_RULE@ - -diff -ruN evolution-2.12.2.orig/composer/Makefile.in evolution-2.12.2/composer/Makefile.in ---- evolution-2.12.2.orig/composer/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/composer/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,57 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = composer --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) --libcomposer_la_LIBADD = --am__objects_1 = Composer-common.lo Composer-skels.lo Composer-stubs.lo --am__objects_2 = Editor-common.lo Editor-skels.lo Editor-stubs.lo --am_libcomposer_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ -- e-msg-composer-hdrs.lo e-msg-composer-select-file.lo \ -- e-msg-composer.lo evolution-composer.lo listener.lo --libcomposer_la_OBJECTS = $(am_libcomposer_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libcomposer_la_SOURCES) --DIST_SOURCES = $(libcomposer_la_SOURCES) --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(errordir)" "$(DESTDIR)$(idldir)" --errorDATA_INSTALL = $(INSTALL_DATA) --idlDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(idl_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -115,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -126,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -151,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -176,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -184,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -242,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -266,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -298,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -305,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -314,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -336,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -366,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -385,32 +384,36 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - IDLS = \ - Evolution-Composer.idl \ - Composer.idl - -+ - IDL_GENERATED = \ - Composer.h \ - Composer-common.c \ - Composer-skels.c \ - Composer-stubs.c - -+ - HTML_EDITOR_GENERATED = \ - Editor.h \ - Editor-common.c \ - Editor-skels.c \ - Editor-stubs.c - -+ - error_DATA = mail-composer.error - errordir = $(privdatadir)/errors -+ - idl_DATA = $(IDLS) -+ - noinst_LTLIBRARIES = libcomposer.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -@@ -429,6 +432,7 @@ - -DG_LOG_DOMAIN=\"composer\" \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - libcomposer_la_SOURCES = \ - $(IDL_GENERATED) \ - $(HTML_EDITOR_GENERATED) \ -@@ -443,61 +447,82 @@ - listener.c \ - listener.h - -+ - EXTRA_DIST = \ - mail-composer.error.xml \ - $(IDLS) \ - ChangeLog.pre-1-4 - -+ - BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = composer -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+ -+libcomposer_la_LDFLAGS = -+libcomposer_la_LIBADD = -+am__objects_1 = Composer-common.lo Composer-skels.lo Composer-stubs.lo -+am__objects_2 = Editor-common.lo Editor-skels.lo Editor-stubs.lo -+am_libcomposer_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ -+ e-msg-composer-hdrs.lo e-msg-composer-select-file.lo \ -+ e-msg-composer.lo evolution-composer.lo listener.lo -+libcomposer_la_OBJECTS = $(am_libcomposer_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Composer-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Composer-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Composer-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Editor-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Editor-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Editor-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-msg-composer-hdrs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-msg-composer-select-file.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-msg-composer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-composer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/listener.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libcomposer_la_SOURCES) -+DATA = $(error_DATA) $(idl_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(libcomposer_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu composer/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu composer/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libcomposer.la: $(libcomposer_la_OBJECTS) $(libcomposer_la_DEPENDENCIES) -- $(LINK) $(libcomposer_la_OBJECTS) $(libcomposer_la_LIBADD) $(LIBS) -+ $(LINK) $(libcomposer_la_LDFLAGS) $(libcomposer_la_OBJECTS) $(libcomposer_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -515,66 +540,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listener.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+idlDATA_INSTALL = $(INSTALL_DATA) - install-idlDATA: $(idl_DATA) - @$(NORMAL_INSTALL) -- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" -+ $(mkinstalldirs) $(DESTDIR)$(idldir) - @list='$(idl_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ -- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ -+ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ - done - - uninstall-idlDATA: - @$(NORMAL_UNINSTALL) - @list='$(idl_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ -+ rm -f $(DESTDIR)$(idldir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -583,7 +634,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -595,11 +645,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -622,23 +671,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -656,10 +710,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(errordir)" "$(DESTDIR)$(idldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(errordir) $(DESTDIR)$(idldir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -681,7 +734,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -696,34 +749,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-errorDATA install-idlDATA - --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 -@@ -744,24 +787,20 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-idlDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-errorDATA uninstall-idlDATA uninstall-info-am - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \ -- 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-errorDATA \ -- install-exec install-exec-am install-html install-html-am \ -- install-idlDATA install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-errorDATA uninstall-idlDATA -+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-idlDATA 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-errorDATA \ -+ uninstall-idlDATA uninstall-info-am - - - $(IDL_GENERATED): $(IDLS) -diff -ruN evolution-2.12.2.orig/configure evolution-2.12.2/configure ---- evolution-2.12.2.orig/configure 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/configure 2007-12-05 15:54:48.000000000 +0100 -@@ -819,7 +819,6 @@ - INSTALL_PROGRAM - INSTALL_SCRIPT - INSTALL_DATA --am__isrc - CYGPATH_W - PACKAGE - VERSION -@@ -828,16 +827,13 @@ - AUTOMAKE - AUTOHEADER - MAKEINFO -+AMTAR - install_sh - STRIP - INSTALL_STRIP_PROGRAM --mkdir_p - AWK - SET_MAKE - am__leading_dot --AMTAR --am__tar --am__untar - build - build_cpu - build_vendor -@@ -901,9 +897,6 @@ - INTLTOOL_THEME_RULE - INTLTOOL_SERVICE_RULE - INTLTOOL_POLICY_RULE --XGETTEXT --MSGMERGE --MSGFMT - INTLTOOL_EXTRACT - INTLTOOL_MERGE - INTLTOOL_UPDATE -@@ -911,8 +904,10 @@ - ALL_LINGUAS - DATADIRNAME - USE_NLS -+MSGFMT - MSGFMT_OPTS - GMSGFMT -+XGETTEXT - CATALOGS - CATOBJEXT - GMOFILES -@@ -924,6 +919,7 @@ - POSUB - MKINSTALLDIRS - GETTEXT_PACKAGE -+SED - ECHO - AR - RANLIB -@@ -1011,7 +1007,6 @@ - GLIB_GENMARSHAL - GOBJECT_QUERY - GLIB_MKENUMS --WARN_CFLAGS - X_CFLAGS - X_LIBS - XMKMF -@@ -1798,10 +1793,10 @@ - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-scrollkeeper do not make updates to the scrollkeeper database -- --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer -- --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors -+ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer -+ --disable-dependency-tracking Speeds up one-time builds -+ --enable-dependency-tracking Do not reject slow dependency extractors - --enable-static[=PKGS] build static libraries [default=no] - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-fast-install[=PKGS] -@@ -1824,9 +1819,6 @@ - (this requires --enable-nss) - --enable-exchange Build Exchange plugins - --disable-glibtest do not try to compile and run a test GLIB program -- --enable-compile-warnings=[no/minimum/yes/maximum/error] -- Turn on compiler warnings -- --enable-iso-c Try to warn if code is not ISO C - --disable-orbittest Do not try to compile and run a test ORBIT program - --enable-file-chooser Enable the usage of the GtkFileChooser in place of - the GtkFileSelection dialog -@@ -2674,7 +2666,9 @@ - enable_scrollkeeper=yes - fi - -- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then -+ -+ -+if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then - ENABLE_SK_TRUE= - ENABLE_SK_FALSE='#' - else -@@ -2683,7 +2677,9 @@ - fi - - -- if test "$gdu_cv_have_gdu" = "yes"; then -+ -+ -+if test "$gdu_cv_have_gdu" = "yes"; then - HAVE_GNOME_DOC_UTILS_TRUE= - HAVE_GNOME_DOC_UTILS_FALSE='#' - else -@@ -2697,8 +2693,7 @@ - # The extra brackets are to foil regex-based scans. - - --am__api_version='1.10' -- -+am__api_version="1.7" - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -2868,6 +2863,7 @@ - program_transform_name=`echo $program_transform_name | sed -f conftest.sed` - rm -f conftest.sed - -+ - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` - -@@ -2881,54 +2877,6 @@ - echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - --{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 --echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } --if test -z "$MKDIR_P"; then -- if test "${ac_cv_path_mkdir+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in mkdir gmkdir; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -- 'mkdir (GNU coreutils) '* | \ -- 'mkdir (coreutils) '* | \ -- 'mkdir (fileutils) '4.1*) -- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -- break 3;; -- esac -- done -- done --done --IFS=$as_save_IFS -- --fi -- -- if test "${ac_cv_path_mkdir+set}" = set; then -- MKDIR_P="$ac_cv_path_mkdir -p" -- else -- # As a last resort, use the slow shell script. Don't cache a -- # value for MKDIR_P within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the value is a relative name. -- test -d ./--version && rmdir ./--version -- MKDIR_P="$ac_install_sh -d" -- fi --fi --{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 --echo "${ECHO_T}$MKDIR_P" >&6; } -- --mkdir_p="$MKDIR_P" --case $mkdir_p in -- [\\/$]* | ?:[\\/]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac -- - for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -3010,16 +2958,12 @@ - fi - rmdir .tst 2>/dev/null - --if test "`cd $srcdir && pwd`" != "`pwd`"; then -- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -- # is not polluted with repeated "-I." -- am__isrc=' -I$(srcdir)' -- # test to see if srcdir already configured -- if test -f $srcdir/config.status; then -- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+ # test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 - echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -- fi - fi - - # test whether we have cygpath -@@ -3062,7 +3006,10 @@ - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - --install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+install_sh=${install_sh-"$am_aux_dir/install-sh"} - - # Installed binaries are usually stripped using `strip' when the user - # run `make install-strip'. However `strip' might not be the right -@@ -3166,98 +3113,10 @@ - fi - - fi --INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. --# Always define AMTAR for backward compatibility. -- --AMTAR=${AMTAR-"${am_missing_run}tar"} -- -- --{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 --echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; } --# Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar plaintar pax cpio none' --_am_tools=${am_cv_prog_tar_ustar-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- { echo "$as_me:$LINENO: $_am_tar --version" >&5 -- ($_am_tar --version) >&5 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && break -- done -- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x ustar -w "$$tardir"' -- am__tar_='pax -L -x ustar -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H ustar -L' -- am__tar_='find "$tardir" -print | cpio -o -H ustar -L' -- am__untar='cpio -i -H ustar -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac -- -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_ustar}" && break -- -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 -- (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- rm -rf conftest.dir -- if test -s conftest.tar; then -- { echo "$as_me:$LINENO: $am__untar &5 -- ($am__untar &5 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break -- fi --done --rm -rf conftest.dir -- --if test "${am_cv_prog_tar_ustar+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- am_cv_prog_tar_ustar=$_am_tool --fi -- --{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5 --echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; } -- -- - - - -@@ -3366,7 +3225,9 @@ - - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 - echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -- if test $USE_MAINTAINER_MODE = yes; then -+ -+ -+if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' - else -@@ -3454,7 +3315,9 @@ - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - fi -- if test "x$enable_dependency_tracking" != xno; then -+ -+ -+if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' - else -@@ -3463,6 +3326,7 @@ - fi - - -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -4423,9 +4287,7 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ : > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -4449,19 +4311,13 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi -@@ -4479,7 +4335,9 @@ - echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -- if -+ -+ -+if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -4491,14 +4349,12 @@ - - - -- -- { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 --echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; } --if test "${ac_cv_lib_cposix_strerror+set}" = set; then -+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -+if test "${ac_cv_search_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lcposix $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4521,7 +4377,14 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext -+for ac_lib in '' cposix; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -@@ -4539,25 +4402,35 @@ - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -- ac_cv_lib_cposix_strerror=yes -+ ac_cv_search_strerror=$ac_res - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_cposix_strerror=no -+ - fi - - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ conftest$ac_exeext -+ if test "${ac_cv_search_strerror+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_strerror+set}" = set; then -+ : -+else -+ ac_cv_search_strerror=no - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 --echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; } --if test $ac_cv_lib_cposix_strerror = yes; then -- LIBS="$LIBS -lcposix" -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -+echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -+ac_res=$ac_cv_search_strerror -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -- -+fi - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -5276,9 +5149,7 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ : > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -5302,19 +5173,13 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi -@@ -5332,7 +5197,9 @@ - echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -- if -+ -+ -+if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -6489,7 +6356,9 @@ - else - HAVE_JW="yes" - fi -- if test x$HAVE_JW = xyes; then -+ -+ -+if test x$HAVE_JW = xyes; then - HAVE_JW_TRUE= - HAVE_JW_FALSE='#' - else -@@ -6566,141 +6435,6 @@ - - - --# Check the gettext tools to make sure they are GNU --# Extract the first word of "xgettext", so it can be a program name with args. --set dummy xgettext; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } --if test "${ac_cv_path_XGETTEXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $XGETTEXT in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- ;; --esac --fi --XGETTEXT=$ac_cv_path_XGETTEXT --if test -n "$XGETTEXT"; then -- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6; } --else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi -- -- --# Extract the first word of "msgmerge", so it can be a program name with args. --set dummy msgmerge; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } --if test "${ac_cv_path_MSGMERGE+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $MSGMERGE in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- ;; --esac --fi --MSGMERGE=$ac_cv_path_MSGMERGE --if test -n "$MSGMERGE"; then -- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 --echo "${ECHO_T}$MSGMERGE" >&6; } --else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi -- -- --# Extract the first word of "msgfmt", so it can be a program name with args. --set dummy msgfmt; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } --if test "${ac_cv_path_MSGFMT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $MSGFMT in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- ;; --esac --fi --MSGFMT=$ac_cv_path_MSGFMT --if test -n "$MSGFMT"; then -- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6; } --else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi -- -- --if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 --echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} -- { (exit 1); exit 1; }; } --fi --xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" --mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" --mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" --if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 --echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} -- { (exit 1); exit 1; }; } --fi -- - # Use the tools built into the package, not the ones that are installed. - INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' - -@@ -8622,12 +8356,13 @@ - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done - done -+IFS=$as_save_IFS - lt_ac_max=0 - lt_ac_count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris -@@ -8662,6 +8397,7 @@ - fi - - SED=$lt_cv_path_SED -+ - { echo "$as_me:$LINENO: result: $SED" >&5 - echo "${ECHO_T}$SED" >&6; } - -@@ -8850,8 +8586,8 @@ - echo "${ECHO_T}$lt_cv_path_NM" >&6; } - NM="$lt_cv_path_NM" - --{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 --echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } - if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8892,16 +8628,22 @@ - - mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by -- # func_win32_libid shell function, so use a weaker test based on 'objdump'. -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -+ # func_win32_libid shell function, so use a weaker test based on 'objdump', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu | dragonfly*) -+freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) -@@ -8939,7 +8681,7 @@ - esac - ;; - --interix3*) -+interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; -@@ -8955,11 +8697,11 @@ - ;; - - # This must be Linux ELF. --linux*) -+linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -8989,6 +8731,10 @@ - lt_cv_deplibs_check_method=pass_all - ;; - -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - solaris*) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -9075,7 +8821,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 9078 "configure"' > conftest.$ac_ext -+ echo '#line 8824 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -9110,7 +8856,8 @@ - rm -rf conftest* - ;; - --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -9121,6 +8868,9 @@ - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; -@@ -9137,6 +8887,9 @@ - ;; - *64-bit*) - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -@@ -10094,9 +9847,7 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ : > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -10120,19 +9871,13 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi -@@ -10150,7 +9895,9 @@ - echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- if -+ -+ -+if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= -@@ -10745,24 +10492,27 @@ - fi - ;; - *) -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && -- new_result=`expr "X$teststring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -- done -- teststring= -- # Add a significant safety factor because C++ compilers can tack on massive -- # amounts of additional arguments before passing them to the linker. -- # It appears as though 1/2 is a usable value. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi - ;; - esac - -@@ -10779,6 +10529,7 @@ - - - -+ - # Check for command to grab the raw symbol name followed by C symbol from nm. - { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 - echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -@@ -10816,7 +10567,7 @@ - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; --linux*) -+linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -@@ -11367,7 +11118,7 @@ - test -z "$ac_objext" && ac_objext=o - - # Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' - old_postinstall_cmds='chmod 644 $oldlib' - old_postuninstall_cmds= - -@@ -11567,10 +11318,10 @@ - objext=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code='int main(){return(0);}' - - - # If no C compiler was specified, use CC. -@@ -11585,13 +11336,13 @@ - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` - $rm conftest* -@@ -11611,7 +11362,7 @@ - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -11622,11 +11373,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:11625: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11376: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:11629: \$? = $ac_status" >&5 -+ echo "$as_me:11380: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -11677,13 +11428,15 @@ - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - -@@ -11693,7 +11446,7 @@ - lt_prog_compiler_pic='-fno-common' - ;; - -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -11751,7 +11504,7 @@ - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -11784,7 +11537,7 @@ - lt_prog_compiler_static='-Bstatic' - ;; - -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' -@@ -11803,6 +11556,22 @@ - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -11812,6 +11581,10 @@ - lt_prog_compiler_static='-non_shared' - ;; - -+ rdos*) -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -@@ -11879,7 +11652,7 @@ - else - lt_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -11890,11 +11663,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:11893: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11666: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:11897: \$? = $ac_status" >&5 -+ echo "$as_me:11670: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -11943,7 +11716,7 @@ - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -11983,7 +11756,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -11994,11 +11767,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:11997: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11770: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:12001: \$? = $ac_status" >&5 -+ echo "$as_me:11774: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12190,7 +11963,7 @@ - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -12208,7 +11981,7 @@ - fi - ;; - -- interix3*) -+ interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -@@ -12223,7 +11996,7 @@ - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - -- linux*) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -12241,20 +12014,30 @@ - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -12406,7 +12189,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct=yes -+ : - else - # We have old collect2 - hardcode_direct=unsupported -@@ -12480,11 +12263,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -12539,11 +12329,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -12597,7 +12394,7 @@ - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; -@@ -12639,10 +12436,10 @@ - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -12682,7 +12479,7 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -12784,7 +12581,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -12804,24 +12601,28 @@ - ;; - - openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs=no - fi - ;; - -@@ -12880,17 +12681,16 @@ - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- case $wlarc in -- '') -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- *) -- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs=yes - ;; -@@ -12947,7 +12747,7 @@ - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no -@@ -13024,7 +12824,7 @@ - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -13082,17 +12882,55 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[lt_foo]++; } -+ if (lt_freq[lt_foo] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -13252,12 +13090,8 @@ - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -13274,18 +13108,6 @@ - dynamic_linker=no - ;; - --kfreebsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -13323,7 +13145,7 @@ - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -13386,7 +13208,7 @@ - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13441,7 +13263,7 @@ - ;; - - # This must be Linux ELF. --linux*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13455,31 +13277,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 13462 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -13491,7 +13292,7 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --knetbsd*-gnu) -+netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13500,7 +13301,7 @@ - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -+ dynamic_linker='NetBSD ld.elf_so' - ;; - - netbsd*) -@@ -13584,6 +13385,10 @@ - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -13737,6 +13542,7 @@ - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" -+ old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - else -@@ -14323,7 +14129,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` - $rm conftest* -@@ -15442,7 +15249,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_CXX=yes -+ : - else - # We have old collect2 - hardcode_direct_CXX=unsupported -@@ -15516,11 +15323,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -15576,11 +15390,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -15699,10 +15520,10 @@ - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -15736,7 +15557,7 @@ - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -15785,9 +15606,7 @@ - hardcode_libdir_separator_CXX=: - - case $host_cpu in -- hppa*64*|ia64*) -- hardcode_libdir_flag_spec_ld_CXX='+b $libdir' -- ;; -+ hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; -@@ -15855,7 +15674,7 @@ - ;; - esac - ;; -- interix3*) -+ interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -@@ -15895,7 +15714,7 @@ - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler -@@ -15975,6 +15794,29 @@ - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -15997,7 +15839,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -16013,16 +15855,20 @@ - ld_shlibs_CXX=no - ;; - openbsd*) -- hardcode_direct_CXX=yes -- hardcode_shlibpath_var_CXX=no -- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -- export_dynamic_flag_spec_CXX='${wl}-E' -- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ ld_shlibs_CXX=no - fi -- output_verbose_link_cmd='echo' - ;; - osf3*) - case $cc_basename in -@@ -16184,15 +16030,10 @@ - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # linker. We must also pass each convience library through -- # to the system linker between allextract/defaultextract. -- # The C++ compiler will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' -+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes -@@ -16239,6 +16080,12 @@ - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - esac -@@ -16430,7 +16277,7 @@ - - # PORTME: override above test on systems where it is broken - case $host_os in --interix3*) -+interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= -@@ -16438,13 +16285,46 @@ - postdeps_CXX= - ;; - -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ - solaris*) - case $cc_basename in - CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. -- postdeps_CXX='-lCstd -lCrun' -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi - ;; - esac - ;; -@@ -16481,12 +16361,14 @@ - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) -@@ -16498,7 +16380,7 @@ - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -16564,7 +16446,7 @@ - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) -@@ -16607,7 +16489,7 @@ - ;; - esac - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler -@@ -16634,6 +16516,14 @@ - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -16650,7 +16540,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -16748,7 +16638,7 @@ - else - lt_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -16759,11 +16649,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16762: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16652: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16766: \$? = $ac_status" >&5 -+ echo "$as_me:16656: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -16812,7 +16702,7 @@ - lt_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -16852,7 +16742,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -16863,11 +16753,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16866: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16756: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16870: \$? = $ac_status" >&5 -+ echo "$as_me:16760: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -16933,7 +16823,10 @@ - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -@@ -16964,7 +16857,7 @@ - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -17022,20 +16915,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -- # if the path contains ";" then we assume it to be the separator -- # otherwise default to the standard path separator (i.e. ":") - it is -- # assumed that no part of a normal pathname contains ";" but that should -- # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -17192,12 +17072,7 @@ - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -17214,18 +17089,6 @@ - dynamic_linker=no - ;; - --kfreebsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -17263,7 +17126,7 @@ - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -17326,7 +17189,7 @@ - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -17381,7 +17244,7 @@ - ;; - - # This must be Linux ELF. --linux*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -17395,31 +17258,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 17402 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -17431,7 +17273,7 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --knetbsd*-gnu) -+netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -17440,7 +17282,7 @@ - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -+ dynamic_linker='NetBSD ld.elf_so' - ;; - - netbsd*) -@@ -17524,6 +17366,10 @@ - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -17718,6 +17564,7 @@ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ -+ fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - -@@ -18038,7 +17885,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_CXX" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX -@@ -18129,10 +17976,17 @@ - objext_F77=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - -@@ -18148,13 +18002,13 @@ - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` - $rm conftest* -@@ -18241,13 +18095,15 @@ - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - -@@ -18257,7 +18113,7 @@ - lt_prog_compiler_pic_F77='-fno-common' - ;; - -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -18315,7 +18171,7 @@ - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' -@@ -18348,7 +18204,7 @@ - lt_prog_compiler_static_F77='-Bstatic' - ;; - -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' -@@ -18367,6 +18223,22 @@ - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -18376,6 +18248,10 @@ - lt_prog_compiler_static_F77='-non_shared' - ;; - -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' -@@ -18443,7 +18319,7 @@ - else - lt_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -18454,11 +18330,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18457: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18333: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18461: \$? = $ac_status" >&5 -+ echo "$as_me:18337: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18507,7 +18383,7 @@ - lt_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -18547,7 +18423,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -18558,11 +18434,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18561: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18437: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18565: \$? = $ac_status" >&5 -+ echo "$as_me:18441: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -18754,7 +18630,7 @@ - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes -- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -18772,7 +18648,7 @@ - fi - ;; - -- interix3*) -+ interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -@@ -18787,7 +18663,7 @@ - archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - -- linux*) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -18805,20 +18681,30 @@ - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -18970,7 +18856,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_F77=yes -+ : - else - # We have old collect2 - hardcode_direct_F77=unsupported -@@ -19034,11 +18920,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -19083,11 +18976,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -19141,7 +19041,7 @@ - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; -@@ -19183,10 +19083,10 @@ - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -19226,7 +19126,7 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes -@@ -19328,7 +19228,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -19348,24 +19248,28 @@ - ;; - - openbsd*) -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_F77='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_F77='-R$libdir' -- ;; -- *) -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs_F77=no - fi - ;; - -@@ -19424,17 +19328,16 @@ - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- case $wlarc in -- '') -- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; -- *) -- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_F77=yes - ;; -@@ -19491,7 +19394,7 @@ - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no -@@ -19568,7 +19471,7 @@ - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -19626,20 +19529,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -- # if the path contains ";" then we assume it to be the separator -- # otherwise default to the standard path separator (i.e. ":") - it is -- # assumed that no part of a normal pathname contains ";" but that should -- # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -19796,12 +19686,7 @@ - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -19818,18 +19703,6 @@ - dynamic_linker=no - ;; - --kfreebsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -19867,7 +19740,7 @@ - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -19930,7 +19803,7 @@ - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -19985,7 +19858,7 @@ - ;; - - # This must be Linux ELF. --linux*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -19999,31 +19872,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 20006 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -20035,7 +19887,7 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --knetbsd*-gnu) -+netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -20044,7 +19896,7 @@ - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -+ dynamic_linker='NetBSD ld.elf_so' - ;; - - netbsd*) -@@ -20128,6 +19980,10 @@ - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -20322,6 +20178,7 @@ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ -+ fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - -@@ -20642,7 +20499,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_F77" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_F77 -@@ -20700,10 +20557,10 @@ - objext_GCJ=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+lt_simple_compile_test_code="class foo {}" - - # Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - -@@ -20719,13 +20576,13 @@ - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` - $rm conftest* -@@ -20766,7 +20623,7 @@ - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -20777,11 +20634,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:20780: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:20637: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:20784: \$? = $ac_status" >&5 -+ echo "$as_me:20641: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -20832,13 +20689,15 @@ - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' - ;; - -@@ -20848,7 +20707,7 @@ - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -20906,7 +20765,7 @@ - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -@@ -20939,7 +20798,7 @@ - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' -@@ -20958,6 +20817,22 @@ - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -20967,6 +20842,10 @@ - lt_prog_compiler_static_GCJ='-non_shared' - ;; - -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ - solaris*) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' -@@ -21034,7 +20913,7 @@ - else - lt_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -21045,11 +20924,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:21048: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:20927: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:21052: \$? = $ac_status" >&5 -+ echo "$as_me:20931: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -21098,7 +20977,7 @@ - lt_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -21138,7 +21017,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -21149,11 +21028,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:21152: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:21031: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:21156: \$? = $ac_status" >&5 -+ echo "$as_me:21035: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -21345,7 +21224,7 @@ - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes -- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -21363,7 +21242,7 @@ - fi - ;; - -- interix3*) -+ interix[3-9]*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -@@ -21378,7 +21257,7 @@ - archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - -- linux*) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -21396,20 +21275,30 @@ - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -21561,7 +21450,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_GCJ=yes -+ : - else - # We have old collect2 - hardcode_direct_GCJ=unsupported -@@ -21635,11 +21524,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21694,11 +21590,18 @@ - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21752,7 +21655,7 @@ - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; -@@ -21794,10 +21697,10 @@ - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -21837,7 +21740,7 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes -@@ -21939,7 +21842,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -21959,24 +21862,28 @@ - ;; - - openbsd*) -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_GCJ='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- ;; -- *) -- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs_GCJ=no - fi - ;; - -@@ -22035,17 +21942,16 @@ - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- case $wlarc in -- '') -- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; -- *) -- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_GCJ=yes - ;; -@@ -22102,7 +22008,7 @@ - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no -@@ -22179,7 +22085,7 @@ - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -22237,20 +22143,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -- # if the path contains ";" then we assume it to be the separator -- # otherwise default to the standard path separator (i.e. ":") - it is -- # assumed that no part of a normal pathname contains ";" but that should -- # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -22407,12 +22300,7 @@ - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -22429,18 +22317,6 @@ - dynamic_linker=no - ;; - --kfreebsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -22478,7 +22354,7 @@ - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -22541,7 +22417,7 @@ - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -22596,7 +22472,7 @@ - ;; - - # This must be Linux ELF. --linux*) -+linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -22610,31 +22486,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 22617 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -22646,7 +22501,7 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --knetbsd*-gnu) -+netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -22655,7 +22510,7 @@ - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -- dynamic_linker='GNU ld.so' -+ dynamic_linker='NetBSD ld.elf_so' - ;; - - netbsd*) -@@ -22739,6 +22594,10 @@ - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -22933,6 +22792,7 @@ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ -+ fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - -@@ -23253,7 +23113,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_GCJ" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_GCJ -@@ -23310,7 +23170,7 @@ - objext_RC=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -23329,13 +23189,13 @@ - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` - $rm conftest* -@@ -23413,6 +23273,7 @@ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ -+ fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - -@@ -23733,7 +23594,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_RC" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_RC -@@ -23979,7 +23840,9 @@ - esac - { echo "$as_me:$LINENO: result: $os_win32" >&5 - echo "${ECHO_T}$os_win32" >&6; } -- if test $os_win32 = yes; then -+ -+ -+if test $os_win32 = yes; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' - else -@@ -24152,7 +24015,7 @@ - and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -24162,7 +24025,7 @@ - and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -24306,7 +24169,7 @@ - and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -24316,7 +24179,7 @@ - and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -25091,7 +24954,9 @@ - PURIFYOPTIONS=$with_purify_options - fi - -- if test x$enable_purify = xyes -a x$PURIFY != ximpure; then -+ -+ -+if test x$enable_purify = xyes -a x$PURIFY != ximpure; then - ENABLE_PURIFY_TRUE= - ENABLE_PURIFY_FALSE='#' - else -@@ -25110,7 +24975,9 @@ - fi - - -- if test x$enable_test_comp = xyes; then -+ -+ -+if test x$enable_test_comp = xyes; then - ENABLE_TEST_COMPONENT_TRUE= - ENABLE_TEST_COMPONENT_FALSE='#' - else -@@ -26539,7 +26406,7 @@ - and GIT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -26549,7 +26416,7 @@ - and GIT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -26651,7 +26518,7 @@ - and A11Y_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -26661,7 +26528,7 @@ - and A11Y_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -27175,7 +27042,9 @@ - - - fi -- if test $with_openldap != no; then -+ -+ -+if test $with_openldap != no; then - ENABLE_LDAP_TRUE= - ENABLE_LDAP_FALSE='#' - else -@@ -27311,7 +27180,9 @@ - #define HAVE_LDAP 1 - _ACEOF - -- if true; then -+ -+ -+if true; then - ENABLE_LDAP_TRUE= - ENABLE_LDAP_FALSE='#' - else -@@ -27781,7 +27652,9 @@ - - - fi -- if test $with_sunldap != no; then -+ -+ -+if test $with_sunldap != no; then - ENABLE_LDAP_TRUE= - ENABLE_LDAP_FALSE='#' - else -@@ -27807,7 +27680,9 @@ - else - with_sunldap=no - fi -- if test x$with_sunldap != xno; then -+ -+ -+if test x$with_sunldap != xno; then - SUNLDAP_TRUE= - SUNLDAP_FALSE='#' - else -@@ -27833,7 +27708,9 @@ - else - msg_nntp=no - fi -- if test x$enable_nntp = xyes; then -+ -+ -+if test x$enable_nntp = xyes; then - ENABLE_NNTP_TRUE= - ENABLE_NNTP_FALSE='#' - else -@@ -27859,7 +27736,9 @@ - else - msg_imapp=no - fi -- if test x$enable_imapp = xyes; then -+ -+ -+if test x$enable_imapp = xyes; then - ENABLE_IMAPP_TRUE= - ENABLE_IMAPP_FALSE='#' - else -@@ -27885,7 +27764,9 @@ - else - msg_imap4=no - fi -- if test x$enable_imap4 = xyes; then -+ -+ -+if test x$enable_imap4 = xyes; then - ENABLE_IMAP4_TRUE= - ENABLE_IMAP4_FALSE='#' - else -@@ -27911,7 +27792,9 @@ - else - msg_cairo=no - fi -- if test x$enable_cairo_calendar = xyes; then -+ -+ -+if test x$enable_cairo_calendar = xyes; then - ENABLE_CAIRO_TRUE= - ENABLE_CAIRO_FALSE='#' - else -@@ -28556,7 +28439,7 @@ - and GTKHTML_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -28566,7 +28449,7 @@ - and GTKHTML_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -28689,7 +28572,7 @@ - and GNOME_PILOT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -28699,7 +28582,7 @@ - and GNOME_PILOT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -28794,7 +28677,9 @@ - { (exit 1); exit 1; }; } - fi - fi -- if test x$enable_pilot_conduits = xyes; then -+ -+ -+if test x$enable_pilot_conduits = xyes; then - ENABLE_PILOT_CONDUITS_TRUE= - ENABLE_PILOT_CONDUITS_FALSE='#' - else -@@ -31114,7 +30999,9 @@ - fi - fi - -- if test "x$msg_smime" != "xno"; then -+ -+ -+if test "x$msg_smime" != "xno"; then - ENABLE_SMIME_TRUE= - ENABLE_SMIME_FALSE='#' - else -@@ -31141,7 +31028,9 @@ - else - msg_exchange=no - fi -- if test x$enable_exchange = xyes; then -+ -+ -+if test x$enable_exchange = xyes; then - ENABLE_EXCHANGE_TRUE= - ENABLE_EXCHANGE_FALSE='#' - else -@@ -31171,7 +31060,9 @@ - echo "${ECHO_T}$DTAPPINTEGRATE" >&6; } - - -- if test x$DTAPPINTEGRATE != xno; then -+ -+ -+if test x$DTAPPINTEGRATE != xno; then - HAVE_DTAPPINTEGRATE_TRUE= - HAVE_DTAPPINTEGRATE_FALSE='#' - else -@@ -31698,138 +31589,7 @@ - - - -- -- -- # Check whether --enable-compile-warnings was given. --if test "${enable_compile_warnings+set}" = set; then -- enableval=$enable_compile_warnings; --else -- enable_compile_warnings="yes" --fi -- -- -- warnCFLAGS= -- if test "x$GCC" != xyes; then -- enable_compile_warnings=no -- fi -- -- warning_flags= -- realsave_CFLAGS="$CFLAGS" -- -- case "$enable_compile_warnings" in -- no) -- warning_flags= -- ;; -- minimum) -- warning_flags="-Wall" -- ;; -- yes) -- warning_flags="-Wall -Wmissing-prototypes" -- ;; -- maximum|error) -- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" -- CFLAGS="$warning_flags $CFLAGS" -- for option in -Wno-sign-compare; do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- has_option=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- has_option=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$SAVE_CFLAGS" -- { echo "$as_me:$LINENO: result: $has_option" >&5 --echo "${ECHO_T}$has_option" >&6; } -- if test $has_option = yes; then -- warning_flags="$warning_flags $option" -- fi -- unset has_option -- unset SAVE_CFLAGS -- done -- unset option -- if test "$enable_compile_warnings" = "error" ; then -- warning_flags="$warning_flags -Werror" -- fi -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 --echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac -- CFLAGS="$realsave_CFLAGS" -- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $warning_flags" >&5 --echo "${ECHO_T}$warning_flags" >&6; } -- -- # Check whether --enable-iso-c was given. --if test "${enable_iso_c+set}" = set; then -- enableval=$enable_iso_c; --else -- enable_iso_c=no --fi -- -- -- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } -- complCFLAGS= -- if test "x$enable_iso_c" != "xno"; then -- if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *\ \ -ansi\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -ansi" ;; -- esac -- case " $CFLAGS " in -- *\ \ -pedantic\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -pedantic" ;; -- esac -- fi -- fi -- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --echo "${ECHO_T}$complCFLAGS" >&6; } -- -- WARN_CFLAGS="$warning_flags $complCFLAGS" -- -- -+GNOME_COMPILE_WARNINGS(yes) - CFLAGS="$CFLAGS $WARN_CFLAGS" - case $CFLAGS in - *-Wall*) -@@ -32139,6 +31899,8 @@ - # Put the nasty error message in config.log where it belongs - echo "$X_PKG_ERRORS" >&5 - -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - - # pkg-config modules not found (only present since X11R7 aka Xorg); use - # old-style detection -@@ -35321,7 +35083,9 @@ - # Put the nasty error message in config.log where it belongs - echo "$HAL_PKG_ERRORS" >&5 - -- HAVE_HAL="no" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ HAVE_HAL="no" - elif test $pkg_failed = untried; then - HAVE_HAL="no" - else -@@ -35493,7 +35257,7 @@ - and CAMEL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -35503,7 +35267,7 @@ - and CAMEL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -35611,7 +35375,7 @@ - and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -35621,7 +35385,7 @@ - and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -35730,7 +35494,7 @@ - and MOZILLA_NSS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -35740,7 +35504,7 @@ - and MOZILLA_NSS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -35852,7 +35616,7 @@ - and CERT_UI_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -35862,7 +35626,7 @@ - and CERT_UI_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -35970,7 +35734,7 @@ - and E_NAME_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -35980,7 +35744,7 @@ - and E_NAME_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -36097,7 +35861,7 @@ - and E_UTIL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -36107,7 +35871,7 @@ - and E_UTIL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -36215,7 +35979,7 @@ - and TZDIALOG_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -36225,7 +35989,7 @@ - and TZDIALOG_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -36333,7 +36097,7 @@ - and E_WIDGETS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -36343,7 +36107,7 @@ - and E_WIDGETS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -36451,7 +36215,7 @@ - and IMPORTERS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -36461,7 +36225,7 @@ - and IMPORTERS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -36569,7 +36333,7 @@ - and LIBFILTER_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -36579,7 +36343,7 @@ - and LIBFILTER_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -36657,7 +36421,9 @@ - # Put the nasty error message in config.log where it belongs - echo "$NM_PKG_ERRORS" >&5 - -- NM_SUPPORT_GLIB="no" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ NM_SUPPORT_GLIB="no" - elif test $pkg_failed = untried; then - NM_SUPPORT_GLIB="no" - else -@@ -36734,7 +36500,9 @@ - # Put the nasty error message in config.log where it belongs - echo "$NM_PKG_ERRORS" >&5 - -- NM_SUPPORT="no" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ NM_SUPPORT="no" - elif test $pkg_failed = untried; then - NM_SUPPORT="no" - else -@@ -36891,7 +36659,9 @@ - fi - fi - -- if test x$NM_SUPPORT_GLIB = xyes; then -+ -+ -+if test x$NM_SUPPORT_GLIB = xyes; then - NM_SUPPORT_GLIB_TRUE= - NM_SUPPORT_GLIB_FALSE='#' - else -@@ -36899,7 +36669,9 @@ - NM_SUPPORT_GLIB_FALSE= - fi - -- if test x$NM_SUPPORT = xyes; then -+ -+ -+if test x$NM_SUPPORT = xyes; then - NM_SUPPORT_TRUE= - NM_SUPPORT_FALSE='#' - else -@@ -37001,7 +36773,7 @@ - and SHELL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37011,7 +36783,7 @@ - and SHELL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -37123,7 +36895,7 @@ - and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37133,7 +36905,7 @@ - and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -37242,7 +37014,7 @@ - and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37252,7 +37024,7 @@ - and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -37330,7 +37102,9 @@ - # Put the nasty error message in config.log where it belongs - echo "$LIBNOTIFY_PKG_ERRORS" >&5 - -- HAVE_LIBNOTIFY="no" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ HAVE_LIBNOTIFY="no" - elif test $pkg_failed = untried; then - HAVE_LIBNOTIFY="no" - else -@@ -37412,7 +37186,9 @@ - # Put the nasty error message in config.log where it belongs - echo "$SOUPTEMP_PKG_ERRORS" >&5 - -- have_libsoup_24="no" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ have_libsoup_24="no" - elif test $pkg_failed = untried; then - have_libsoup_24="no" - else -@@ -37522,7 +37298,7 @@ - and LIBSOUP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37532,7 +37308,7 @@ - and LIBSOUP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -37640,7 +37416,7 @@ - and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37650,7 +37426,7 @@ - and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -37759,7 +37535,7 @@ - and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37769,7 +37545,7 @@ - and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -37879,7 +37655,7 @@ - and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -37889,7 +37665,7 @@ - and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -38026,7 +37802,7 @@ - and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -38036,7 +37812,7 @@ - and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -38319,7 +38095,7 @@ - and GSTREAMER_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -38329,7 +38105,7 @@ - and GSTREAMER_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -38441,7 +38217,7 @@ - and NMN_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -38451,7 +38227,7 @@ - and NMN_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -38535,7 +38311,9 @@ - # Put the nasty error message in config.log where it belongs - echo "$LIBEXCHANGESTORAGE_PKG_ERRORS" >&5 - -- have_libexchange="no" -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ have_libexchange="no" - elif test $pkg_failed = untried; then - have_libexchange="no" - else -@@ -38638,7 +38416,7 @@ - and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&5 - echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full -@@ -38648,7 +38426,7 @@ - and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - --To get pkg-config, see . -+To get pkg-config, see . - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -@@ -38761,7 +38539,9 @@ - fi - fi - -- if test x$enable_gtk_doc = xyes; then -+ -+ -+if test x$enable_gtk_doc = xyes; then - ENABLE_GTK_DOC_TRUE= - ENABLE_GTK_DOC_FALSE='#' - else -@@ -38854,7 +38634,9 @@ - esac - fi - -- if test "$enable_schemas_install" != no; then -+ -+ -+if test "$enable_schemas_install" != no; then - GCONF_SCHEMAS_INSTALL_TRUE= - GCONF_SCHEMAS_INSTALL_FALSE='#' - else -@@ -38885,7 +38667,9 @@ - fi - - -- if test x$enable_default_binary = xyes; then -+ -+ -+if test x$enable_default_binary = xyes; then - DEFAULT_BINARY_TRUE= - DEFAULT_BINARY_FALSE='#' - else -@@ -38912,7 +38696,9 @@ - else - KDE_APPLNK_DIR="" - fi -- if test x"$KDE_APPLNK_DIR" != x; then -+ -+ -+if test x"$KDE_APPLNK_DIR" != x; then - HAVE_KDE_APPLNK_TRUE= - HAVE_KDE_APPLNK_FALSE='#' - else -@@ -39600,7 +39386,6 @@ - ac_pwd='$ac_pwd' - srcdir='$srcdir' - INSTALL='$INSTALL' --MKDIR_P='$MKDIR_P' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -39974,7 +39759,6 @@ - INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim - INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim - INSTALL_DATA!$INSTALL_DATA$ac_delim --am__isrc!$am__isrc$ac_delim - CYGPATH_W!$CYGPATH_W$ac_delim - PACKAGE!$PACKAGE$ac_delim - VERSION!$VERSION$ac_delim -@@ -39983,16 +39767,13 @@ - AUTOMAKE!$AUTOMAKE$ac_delim - AUTOHEADER!$AUTOHEADER$ac_delim - MAKEINFO!$MAKEINFO$ac_delim -+AMTAR!$AMTAR$ac_delim - install_sh!$install_sh$ac_delim - STRIP!$STRIP$ac_delim - INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim --mkdir_p!$mkdir_p$ac_delim - AWK!$AWK$ac_delim - SET_MAKE!$SET_MAKE$ac_delim - am__leading_dot!$am__leading_dot$ac_delim --AMTAR!$AMTAR$ac_delim --am__tar!$am__tar$ac_delim --am__untar!$am__untar$ac_delim - build!$build$ac_delim - build_cpu!$build_cpu$ac_delim - build_vendor!$build_vendor$ac_delim -@@ -40012,6 +39793,10 @@ - LDFLAGS!$LDFLAGS$ac_delim - CPPFLAGS!$CPPFLAGS$ac_delim - ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then -@@ -40065,10 +39850,6 @@ - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF --EXEEXT!$EXEEXT$ac_delim --OBJEXT!$OBJEXT$ac_delim --DEPDIR!$DEPDIR$ac_delim --am__include!$am__include$ac_delim - am__quote!$am__quote$ac_delim - AMDEP_TRUE!$AMDEP_TRUE$ac_delim - AMDEP_FALSE!$AMDEP_FALSE$ac_delim -@@ -40109,9 +39890,6 @@ - INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim - INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim - INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim --XGETTEXT!$XGETTEXT$ac_delim --MSGMERGE!$MSGMERGE$ac_delim --MSGFMT!$MSGFMT$ac_delim - INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim - INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim - INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim -@@ -40119,8 +39897,10 @@ - ALL_LINGUAS!$ALL_LINGUAS$ac_delim - DATADIRNAME!$DATADIRNAME$ac_delim - USE_NLS!$USE_NLS$ac_delim -+MSGFMT!$MSGFMT$ac_delim - MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim - GMSGFMT!$GMSGFMT$ac_delim -+XGETTEXT!$XGETTEXT$ac_delim - CATALOGS!$CATALOGS$ac_delim - CATOBJEXT!$CATOBJEXT$ac_delim - GMOFILES!$GMOFILES$ac_delim -@@ -40132,6 +39912,7 @@ - POSUB!$POSUB$ac_delim - MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim - GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim -+SED!$SED$ac_delim - ECHO!$ECHO$ac_delim - AR!$AR$ac_delim - RANLIB!$RANLIB$ac_delim -@@ -40162,6 +39943,10 @@ - PURIFY!$PURIFY$ac_delim - ENABLE_PURIFY_TRUE!$ENABLE_PURIFY_TRUE$ac_delim - ENABLE_PURIFY_FALSE!$ENABLE_PURIFY_FALSE$ac_delim -+ENABLE_TEST_COMPONENT_TRUE!$ENABLE_TEST_COMPONENT_TRUE$ac_delim -+ENABLE_TEST_COMPONENT_FALSE!$ENABLE_TEST_COMPONENT_FALSE$ac_delim -+GIT_CFLAGS!$GIT_CFLAGS$ac_delim -+GIT_LIBS!$GIT_LIBS$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -40203,10 +39988,6 @@ - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF --ENABLE_TEST_COMPONENT_TRUE!$ENABLE_TEST_COMPONENT_TRUE$ac_delim --ENABLE_TEST_COMPONENT_FALSE!$ENABLE_TEST_COMPONENT_FALSE$ac_delim --GIT_CFLAGS!$GIT_CFLAGS$ac_delim --GIT_LIBS!$GIT_LIBS$ac_delim - A11Y_CFLAGS!$A11Y_CFLAGS$ac_delim - A11Y_LIBS!$A11Y_LIBS$ac_delim - LDAP_CFLAGS!$LDAP_CFLAGS$ac_delim -@@ -40260,7 +40041,6 @@ - GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim - GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim - GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim --WARN_CFLAGS!$WARN_CFLAGS$ac_delim - X_CFLAGS!$X_CFLAGS$ac_delim - X_LIBS!$X_LIBS$ac_delim - XMKMF!$XMKMF$ac_delim -@@ -40300,6 +40080,11 @@ - NM_SUPPORT_GLIB_FALSE!$NM_SUPPORT_GLIB_FALSE$ac_delim - NM_SUPPORT_TRUE!$NM_SUPPORT_TRUE$ac_delim - NM_SUPPORT_FALSE!$NM_SUPPORT_FALSE$ac_delim -+SHELL_CFLAGS!$SHELL_CFLAGS$ac_delim -+SHELL_LIBS!$SHELL_LIBS$ac_delim -+EVOLUTION_ADDRESSBOOK_CFLAGS!$EVOLUTION_ADDRESSBOOK_CFLAGS$ac_delim -+EVOLUTION_ADDRESSBOOK_LIBS!$EVOLUTION_ADDRESSBOOK_LIBS$ac_delim -+EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS!$EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -40341,11 +40126,6 @@ - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF --SHELL_CFLAGS!$SHELL_CFLAGS$ac_delim --SHELL_LIBS!$SHELL_LIBS$ac_delim --EVOLUTION_ADDRESSBOOK_CFLAGS!$EVOLUTION_ADDRESSBOOK_CFLAGS$ac_delim --EVOLUTION_ADDRESSBOOK_LIBS!$EVOLUTION_ADDRESSBOOK_LIBS$ac_delim --EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS!$EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS$ac_delim - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS!$EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS$ac_delim - LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim - LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim -@@ -40418,7 +40198,7 @@ - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -40645,11 +40425,6 @@ - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -- ac_MKDIR_P=$MKDIR_P -- case $MKDIR_P in -- [\\/$]* | ?:[\\/]* ) ;; -- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -- esac - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -40703,7 +40478,6 @@ - s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - s&@INSTALL@&$ac_INSTALL&;t t --s&@MKDIR_P@&$ac_MKDIR_P&;t t - $ac_datarootdir_hack - " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out - -@@ -40868,9 +40642,8 @@ - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -- # Grep'ing the whole file is not good either: AIX grep has a line -- # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ -@@ -40897,21 +40670,27 @@ - else - continue - fi -- # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -+ # Extract the definition of DEP_FILES from the Makefile without -+ # running `make'. -+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` - test -z "$DEPDIR" && continue -- am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` -- # Find all dependency output files, they are included files with -- # $(DEPDIR) in their names. We invoke sed twice because it is the -- # simplest approach to changing $(DEPDIR) to its actual value in the -- # expansion. -- for file in `sed -n " -- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ U=`sed -n -e '/^U = / s///p' < "$mf"` -+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -+ # We invoke sed twice because it is the simplest approach to -+ # changing $(DEPDIR) to its actual value in the expansion. -+ for file in `sed -n -e ' -+ /^DEP_FILES = .*\\\\$/ { -+ s/^DEP_FILES = // -+ :loop -+ s/\\\\$// -+ p -+ n -+ /\\\\$/ b loop -+ p -+ } -+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -diff -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/appmanager/C --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = Ximian -+subdir = data/cde_app_root/dt/appconfig/appmanager/C -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,28 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/appmanager/C/Ximian --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__installdirs = "$(DESTDIR)$(cdeappmanagerdir)" --cdeappmanagerSCRIPT_INSTALL = $(INSTALL_SCRIPT) --SCRIPTS = $(cdeappmanager_SCRIPTS) --SOURCES = --DIST_SOURCES = --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -85,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -96,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -121,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -146,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -154,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -212,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -236,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -260,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -268,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -275,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -284,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -306,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -336,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -355,56 +384,40 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - EXTRA_DIST = Evolution -+ - @HAVE_DTAPPINTEGRATE_TRUE@cdeappmanagerdir = $(privdatadir)/cde_app_root/dt/appconfig/appmanager/C/Ximian - @HAVE_DTAPPINTEGRATE_TRUE@cdeappmanager_SCRIPTS = Evolution -+subdir = data/cde_app_root/dt/appconfig/appmanager/C/Ximian -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SCRIPTS = $(cdeappmanager_SCRIPTS) -+ -+DIST_SOURCES = -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+cdeappmanagerSCRIPT_INSTALL = $(INSTALL_SCRIPT) - install-cdeappmanagerSCRIPTS: $(cdeappmanager_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(cdeappmanagerdir)" || $(MKDIR_P) "$(DESTDIR)$(cdeappmanagerdir)" -+ $(mkinstalldirs) $(DESTDIR)$(cdeappmanagerdir) - @list='$(cdeappmanager_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(cdeappmanagerSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(cdeappmanagerdir)/$$f'"; \ -- $(cdeappmanagerSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(cdeappmanagerdir)/$$f"; \ -+ echo " $(cdeappmanagerSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(cdeappmanagerdir)/$$f"; \ -+ $(cdeappmanagerSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(cdeappmanagerdir)/$$f; \ - else :; fi; \ - done - -@@ -412,8 +425,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(cdeappmanager_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " rm -f '$(DESTDIR)$(cdeappmanagerdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(cdeappmanagerdir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(cdeappmanagerdir)/$$f"; \ -+ rm -f $(DESTDIR)$(cdeappmanagerdir)/$$f; \ - done - - mostlyclean-libtool: -@@ -421,29 +434,38 @@ - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: - tags: TAGS - TAGS: - - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -457,10 +479,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(SCRIPTS) -+ - installdirs: -- for dir in "$(DESTDIR)$(cdeappmanagerdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(cdeappmanagerdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -480,7 +501,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -491,34 +512,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-cdeappmanagerSCRIPTS - --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 -@@ -537,21 +548,18 @@ - - ps-am: - --uninstall-am: uninstall-cdeappmanagerSCRIPTS -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-cdeappmanagerSCRIPTS uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -+ dvi-am info info-am install install-am \ - install-cdeappmanagerSCRIPTS install-data install-data-am \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -+ 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-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-cdeappmanagerSCRIPTS -+ ps ps-am uninstall uninstall-am uninstall-cdeappmanagerSCRIPTS \ -+ 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/appmanager/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/appmanager/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/appmanager --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = C -+subdir = data/cde_app_root/dt/appconfig/appmanager -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/appmanager/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/C/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/C/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/C/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/C/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/icons/C --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(cdeiconsdir)" --cdeiconsDATA_INSTALL = $(INSTALL_DATA) --DATA = $(cdeicons_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - ICONS = \ - Evolution.l.pm \ -@@ -375,63 +395,55 @@ - Ximian.m.pm \ - Ximian.t.pm - -+ - EXTRA_DIST = $(ICONS) -+ - @HAVE_DTAPPINTEGRATE_TRUE@cdeiconsdir = $(privdatadir)/cde_app_root/dt/appconfig/icons/C - @HAVE_DTAPPINTEGRATE_TRUE@cdeicons_DATA = $(ICONS) -+subdir = data/cde_app_root/dt/appconfig/icons/C -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(cdeicons_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/C/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/C/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+cdeiconsDATA_INSTALL = $(INSTALL_DATA) - install-cdeiconsDATA: $(cdeicons_DATA) - @$(NORMAL_INSTALL) -- test -z "$(cdeiconsdir)" || $(MKDIR_P) "$(DESTDIR)$(cdeiconsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(cdeiconsdir) - @list='$(cdeicons_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(cdeiconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cdeiconsdir)/$$f'"; \ -- $(cdeiconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cdeiconsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(cdeiconsDATA_INSTALL) $$d$$p $(DESTDIR)$(cdeiconsdir)/$$f"; \ -+ $(cdeiconsDATA_INSTALL) $$d$$p $(DESTDIR)$(cdeiconsdir)/$$f; \ - done - - uninstall-cdeiconsDATA: - @$(NORMAL_UNINSTALL) - @list='$(cdeicons_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(cdeiconsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(cdeiconsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(cdeiconsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(cdeiconsdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -439,23 +451,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +486,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(cdeiconsdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(cdeiconsdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -492,7 +508,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -503,34 +519,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-cdeiconsDATA - --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,21 +555,17 @@ - - ps-am: - --uninstall-am: uninstall-cdeiconsDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-cdeiconsDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-cdeiconsDATA install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-cdeiconsDATA -+ dvi-am info info-am install install-am install-cdeiconsDATA \ -+ 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-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-cdeiconsDATA 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/icons/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/icons/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/icons --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = C -+subdir = data/cde_app_root/dt/appconfig/icons -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/icons/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = appmanager icons types -+subdir = data/cde_app_root/dt/appconfig -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/C/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/types/C/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/C/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/types/C/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,35 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/types/C --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- $(srcdir)/Ximian.dt.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = Ximian.dt --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(cdetypesdir)" --cdetypesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(cdetypes_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -92,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -103,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -128,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -153,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -161,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -219,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -243,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -267,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -275,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -282,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -291,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -313,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -343,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -362,48 +384,31 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - EXTRA_DIST = Ximian.dt.in -+ - @HAVE_DTAPPINTEGRATE_TRUE@cdetypesdir = $(privdatadir)/cde_app_root/dt/appconfig/types/C - @HAVE_DTAPPINTEGRATE_TRUE@cdetypes_DATA = Ximian.dt -+subdir = data/cde_app_root/dt/appconfig/types/C -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = Ximian.dt -+DIST_SOURCES = -+DATA = $(cdetypes_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Ximian.dt.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/C/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/C/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --Ximian.dt: $(top_builddir)/config.status $(srcdir)/Ximian.dt.in -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+Ximian.dt: $(top_builddir)/config.status Ximian.dt.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - mostlyclean-libtool: -@@ -411,22 +416,27 @@ - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+cdetypesDATA_INSTALL = $(INSTALL_DATA) - install-cdetypesDATA: $(cdetypes_DATA) - @$(NORMAL_INSTALL) -- test -z "$(cdetypesdir)" || $(MKDIR_P) "$(DESTDIR)$(cdetypesdir)" -+ $(mkinstalldirs) $(DESTDIR)$(cdetypesdir) - @list='$(cdetypes_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(cdetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cdetypesdir)/$$f'"; \ -- $(cdetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cdetypesdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(cdetypesDATA_INSTALL) $$d$$p $(DESTDIR)$(cdetypesdir)/$$f"; \ -+ $(cdetypesDATA_INSTALL) $$d$$p $(DESTDIR)$(cdetypesdir)/$$f; \ - done - - uninstall-cdetypesDATA: - @$(NORMAL_UNINSTALL) - @list='$(cdetypes_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(cdetypesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(cdetypesdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(cdetypesdir)/$$f"; \ -+ rm -f $(DESTDIR)$(cdetypesdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -434,23 +444,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +479,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(cdetypesdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(cdetypesdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -487,7 +501,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -498,34 +512,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-cdetypesDATA - --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,21 +548,17 @@ - - ps-am: - --uninstall-am: uninstall-cdetypesDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-cdetypesDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-cdetypesDATA install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-cdetypesDATA -+ dvi-am info info-am install install-am install-cdetypesDATA \ -+ 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-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-cdetypesDATA 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/Makefile.in evolution-2.12.2/data/cde_app_root/dt/appconfig/types/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/appconfig/types/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/appconfig/types/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt/appconfig/types --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = C -+subdir = data/cde_app_root/dt/appconfig/types -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/appconfig/types/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/dt/Makefile.in evolution-2.12.2/data/cde_app_root/dt/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/dt/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/dt/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root/dt --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = appconfig -+subdir = data/cde_app_root/dt -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/dt/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/dt/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/cde_app_root/Makefile.in evolution-2.12.2/data/cde_app_root/Makefile.in ---- evolution-2.12.2.orig/data/cde_app_root/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/cde_app_root/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data/cde_app_root --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = dt -+subdir = data/cde_app_root -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/cde_app_root/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/cde_app_root/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/data/Makefile.in evolution-2.12.2/data/Makefile.in ---- evolution-2.12.2.orig/data/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/data/Makefile.in 2007-12-05 15:54:53.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,38 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = data --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --DATA = $(noinst_DATA) --RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -- distclean-recursive maintainer-clean-recursive --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -95,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -106,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -131,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -156,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -164,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -222,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -246,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -270,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -278,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -285,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -294,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -316,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -346,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -365,67 +384,63 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - desktopdir = $(datadir)/applications - desktop_in_in_file = evolution.desktop.in.in - desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) -+ - keysdir = $(datadir)/mime-info - keys_in_file = evolution.keys.in.in - keys_file = $(keys_in_file:.keys.in.in=.keys) -+ - mimedir = $(datadir)/mime-info - mime_file = evolution.mime -+ - @HAVE_KDE_APPLNK_TRUE@kdedesktopdir = $(KDE_APPLNK_DIR)/Applications - @HAVE_KDE_APPLNK_TRUE@kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) -+ - noinst_MANS = evolution.1 - noinst_DATA = $(keys_file) $(desktop_file) -+ - SUBDIRS = cde_app_root -+ - CLEANFILES = \ - $(desktop_file) \ - $(keys_file) - -+ - EXTRA_DIST = \ - $(desktop_in_in_file) \ - $(mime_file) \ - $(keys_in_file) \ - $(noinst_MANS) - -+subdir = data -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(noinst_DATA) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -433,6 +448,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, -@@ -440,13 +459,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -458,20 +471,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -492,7 +500,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -503,6 +511,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -511,22 +527,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -536,11 +549,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -563,23 +575,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -590,19 +607,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -612,6 +625,7 @@ - all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -632,7 +646,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -643,34 +657,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: install-data-local - --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 -@@ -689,24 +694,26 @@ - - ps-am: - --uninstall-am: uninstall-local -+uninstall-am: uninstall-info-am uninstall-local - --.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 \ -- html-am info info-am install install-am install-data \ -- install-data-am install-data-local install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am uninstall-local -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-local \ -+ install-data-recursive install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-local uninstall-recursive - - %.desktop.in: %.desktop.in.in - sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" -e "s|\@DATASERVER_EXEC_VERSION\@|$(DATASERVER_EXEC_VERSION)|" $< > $@ -diff -ruN evolution-2.12.2.orig/e-util/Makefile.in evolution-2.12.2/e-util/Makefile.in ---- evolution-2.12.2.orig/e-util/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/e-util/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,108 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = e-util --DIST_COMMON = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) \ -- $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(econdincludedir)" "$(DESTDIR)$(eutilincludedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libeconduit_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am__libeconduit_la_SOURCES_DIST = e-html-utils.c e-pilot-map.h \ -- e-pilot-util.h e-pilot-map.c e-pilot-util.c --am__objects_1 = --am__objects_2 = $(am__objects_1) e-pilot-map.lo e-pilot-util.lo --@ENABLE_PILOT_CONDUITS_FALSE@am__objects_3 = e-html-utils.lo --@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = $(am__objects_2) --am_libeconduit_la_OBJECTS = $(am__objects_3) --libeconduit_la_OBJECTS = $(am_libeconduit_la_OBJECTS) --libeconduit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libeconduit_la_LDFLAGS) $(LDFLAGS) -o $@ --libeutil_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --am__libeutil_la_SOURCES_DIST = e-bconf-map.h e-categories-config.h \ -- e-config.h e-config-listener.h e-corba-utils.h e-cursor.h \ -- e-dialog-utils.h e-dialog-widgets.h e-error.h e-event.h \ -- e-folder-map.h e-fsutils.h e-gui-utils.h e-html-utils.h \ -- e-icon-factory.h e-import.h e-menu.h e-mktemp.h e-print.h \ -- e-plugin.h e-popup.h e-profile-event.h e-request.h \ -- e-signature.h e-signature-list.h e-bit-array.h e-sorter.h \ -- e-sorter-array.h e-text-event-processor-emacs-like.h \ -- e-text-event-processor-types.h e-text-event-processor.h \ -- e-util.h e-util-marshal.h e-xml-utils.h e-util-marshal.c \ -- e-bconf-map.c e-categories-config.c e-config.c \ -- e-config-listener.c e-corba-utils.c e-cursor.c \ -- e-dialog-utils.c e-dialog-widgets.c e-error.c e-event.c \ -- e-folder-map.c e-fsutils.c e-gui-utils.c e-html-utils.c \ -- e-icon-factory.c e-import.c e-menu.c e-mktemp.c e-plugin.c \ -- e-popup.c e-print.c e-profile-event.c e-request.c \ -- e-signature.c e-signature-list.c e-bit-array.c e-sorter.c \ -- e-sorter-array.c e-text-event-processor-emacs-like.c \ -- e-text-event-processor.c e-util.c e-util-private.h \ -- e-xml-utils.c e-win32-reloc.c --@OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo --am_libeutil_la_OBJECTS = $(am__objects_1) e-util-marshal.lo \ -- e-bconf-map.lo e-categories-config.lo e-config.lo \ -- e-config-listener.lo e-corba-utils.lo e-cursor.lo \ -- e-dialog-utils.lo e-dialog-widgets.lo e-error.lo e-event.lo \ -- e-folder-map.lo e-fsutils.lo e-gui-utils.lo e-html-utils.lo \ -- e-icon-factory.lo e-import.lo e-menu.lo e-mktemp.lo \ -- e-plugin.lo e-popup.lo e-print.lo e-profile-event.lo \ -- e-request.lo e-signature.lo e-signature-list.lo e-bit-array.lo \ -- e-sorter.lo e-sorter-array.lo \ -- e-text-event-processor-emacs-like.lo e-text-event-processor.lo \ -- e-util.lo e-xml-utils.lo $(am__objects_4) --libeutil_la_OBJECTS = $(am_libeutil_la_OBJECTS) --libeutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libeutil_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libeconduit_la_SOURCES) $(libeutil_la_SOURCES) --DIST_SOURCES = $(am__libeconduit_la_SOURCES_DIST) \ -- $(am__libeutil_la_SOURCES_DIST) --errorDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) --econdincludeHEADERS_INSTALL = $(INSTALL_HEADER) --eutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -167,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -178,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -203,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -228,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -236,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -294,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -318,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -342,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -350,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -357,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -366,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -388,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -418,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -437,18 +384,17 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - eutilincludedir = $(privincludedir)/e-util - econdincludedir = $(privincludedir)/e-conduit - ecpsdir = $(privdatadir)/ecps - ruledir = $(privdatadir) -+ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la - @OS_WIN32_TRUE@PLATFORM_SOURCES = e-win32-reloc.c -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -@@ -478,7 +424,9 @@ - $(ICONV_CFLAGS) \ - $(E_UTIL_CFLAGS) - -+ - privsolib_LTLIBRARIES = libeutil.la libeconduit.la -+ - eutilinclude_HEADERS = \ - e-bconf-map.h \ - e-categories-config.h \ -@@ -515,6 +463,7 @@ - e-util-marshal.h \ - e-xml-utils.h - -+ - libeutil_la_SOURCES = \ - $(eutilinclude_HEADERS) \ - e-util-marshal.c \ -@@ -553,106 +502,200 @@ - e-xml-utils.c \ - $(PLATFORM_SOURCES) - -+ - MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h -+ - libeutil_la_LDFLAGS = $(NO_UNDEFINED) -+ - libeutil_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(ICONV_LIBS) \ - $(E_UTIL_LIBS) \ - $(INTLLIBS) - -+ - econdinclude_HEADERS = \ - e-pilot-map.h \ - e-pilot-util.h - -+ - pilot_sources = \ - $(econdinclude_HEADERS) \ - e-pilot-map.c \ - e-pilot-util.c - --@ENABLE_PILOT_CONDUITS_FALSE@pilot_compile = e-html-utils.c -+ - @ENABLE_PILOT_CONDUITS_TRUE@pilot_compile = $(pilot_sources) -+@ENABLE_PILOT_CONDUITS_FALSE@pilot_compile = e-html-utils.c -+ - libeconduit_la_SOURCES = $(pilot_compile) -+ - libeconduit_la_LDFLAGS = $(NO_UNDEFINED) -+ - libeconduit_la_LIBADD = $(E_UTIL_LIBS) -+ - error_DATA = e-system.error - errordir = $(privdatadir)/errors -+ - EXTRA_DIST = \ - e-system.error.xml \ - $(pilot_sources) \ - ChangeLog.pre-1-4 \ - e-util-marshal.list - -+ - BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = e-util -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libeconduit_la_DEPENDENCIES = -+am__libeconduit_la_SOURCES_DIST = e-pilot-map.h e-pilot-util.h \ -+ e-pilot-map.c e-pilot-util.c e-html-utils.c -+am__objects_1 = -+am__objects_2 = $(am__objects_1) e-pilot-map.lo e-pilot-util.lo -+@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = $(am__objects_2) -+@ENABLE_PILOT_CONDUITS_FALSE@am__objects_3 = e-html-utils.lo -+am_libeconduit_la_OBJECTS = $(am__objects_3) -+libeconduit_la_OBJECTS = $(am_libeconduit_la_OBJECTS) -+@OS_WIN32_TRUE@libeutil_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la -+@OS_WIN32_FALSE@libeutil_la_DEPENDENCIES = -+am__libeutil_la_SOURCES_DIST = e-bconf-map.h e-categories-config.h \ -+ e-config.h e-config-listener.h e-corba-utils.h e-cursor.h \ -+ e-dialog-utils.h e-dialog-widgets.h e-error.h e-event.h \ -+ e-folder-map.h e-fsutils.h e-gui-utils.h e-html-utils.h \ -+ e-icon-factory.h e-import.h e-menu.h e-mktemp.h e-print.h \ -+ e-plugin.h e-popup.h e-profile-event.h e-request.h \ -+ e-signature.h e-signature-list.h e-bit-array.h e-sorter.h \ -+ e-sorter-array.h e-text-event-processor-emacs-like.h \ -+ e-text-event-processor-types.h e-text-event-processor.h \ -+ e-util.h e-util-marshal.h e-xml-utils.h e-util-marshal.c \ -+ e-bconf-map.c e-categories-config.c e-config.c \ -+ e-config-listener.c e-corba-utils.c e-cursor.c e-dialog-utils.c \ -+ e-dialog-widgets.c e-error.c e-event.c e-folder-map.c \ -+ e-fsutils.c e-gui-utils.c e-html-utils.c e-icon-factory.c \ -+ e-import.c e-menu.c e-mktemp.c e-plugin.c e-popup.c e-print.c \ -+ e-profile-event.c e-request.c e-signature.c e-signature-list.c \ -+ e-bit-array.c e-sorter.c e-sorter-array.c \ -+ e-text-event-processor-emacs-like.c e-text-event-processor.c \ -+ e-util.c e-util-private.h e-xml-utils.c e-win32-reloc.c -+@OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo -+am_libeutil_la_OBJECTS = $(am__objects_1) e-util-marshal.lo \ -+ e-bconf-map.lo e-categories-config.lo e-config.lo \ -+ e-config-listener.lo e-corba-utils.lo e-cursor.lo \ -+ e-dialog-utils.lo e-dialog-widgets.lo e-error.lo e-event.lo \ -+ e-folder-map.lo e-fsutils.lo e-gui-utils.lo e-html-utils.lo \ -+ e-icon-factory.lo e-import.lo e-menu.lo e-mktemp.lo e-plugin.lo \ -+ e-popup.lo e-print.lo e-profile-event.lo e-request.lo \ -+ e-signature.lo e-signature-list.lo e-bit-array.lo e-sorter.lo \ -+ e-sorter-array.lo e-text-event-processor-emacs-like.lo \ -+ e-text-event-processor.lo e-util.lo e-xml-utils.lo \ -+ $(am__objects_4) -+libeutil_la_OBJECTS = $(am_libeutil_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-bconf-map.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-bit-array.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-categories-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-config-listener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-corba-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cursor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-dialog-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-dialog-widgets.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-error.Plo ./$(DEPDIR)/e-event.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-folder-map.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-fsutils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-gui-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-html-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-icon-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-import.Plo ./$(DEPDIR)/e-menu.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-mktemp.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-pilot-map.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-pilot-util.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-plugin.Plo ./$(DEPDIR)/e-popup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-print.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-profile-event.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-request.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-signature-list.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-signature.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-sorter-array.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-sorter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-text-event-processor-emacs-like.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-text-event-processor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-util-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-util.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-win32-reloc.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-xml-utils.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(am__libeconduit_la_SOURCES_DIST) \ -+ $(am__libeutil_la_SOURCES_DIST) -+DATA = $(error_DATA) -+ -+HEADERS = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) -+ -+DIST_COMMON = $(econdinclude_HEADERS) $(eutilinclude_HEADERS) \ -+ $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(libeconduit_la_SOURCES) $(libeutil_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu e-util/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu e-util/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libeconduit.la: $(libeconduit_la_OBJECTS) $(libeconduit_la_DEPENDENCIES) -- $(libeconduit_la_LINK) -rpath $(privsolibdir) $(libeconduit_la_OBJECTS) $(libeconduit_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libeconduit_la_LDFLAGS) $(libeconduit_la_OBJECTS) $(libeconduit_la_LIBADD) $(LIBS) - libeutil.la: $(libeutil_la_OBJECTS) $(libeutil_la_DEPENDENCIES) -- $(libeutil_la_LINK) -rpath $(privsolibdir) $(libeutil_la_OBJECTS) $(libeutil_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libeutil_la_LDFLAGS) $(libeutil_la_OBJECTS) $(libeutil_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -695,83 +738,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-xml-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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+econdincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-econdincludeHEADERS: $(econdinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(econdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(econdincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(econdincludedir) - @list='$(econdinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(econdincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(econdincludedir)/$$f'"; \ -- $(econdincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(econdincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(econdincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(econdincludedir)/$$f"; \ -+ $(econdincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(econdincludedir)/$$f; \ - done - - uninstall-econdincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(econdinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(econdincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(econdincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(econdincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(econdincludedir)/$$f; \ - done -+eutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-eutilincludeHEADERS: $(eutilinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(eutilincludedir)" || $(MKDIR_P) "$(DESTDIR)$(eutilincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(eutilincludedir) - @list='$(eutilinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(eutilincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eutilincludedir)/$$f'"; \ -- $(eutilincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eutilincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(eutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eutilincludedir)/$$f"; \ -+ $(eutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eutilincludedir)/$$f; \ - done - - uninstall-eutilincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(eutilinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(eutilincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(eutilincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(eutilincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(eutilincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -780,7 +850,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -792,11 +861,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -819,23 +887,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -853,10 +926,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(econdincludedir)" "$(DESTDIR)$(eutilincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(errordir) $(DESTDIR)$(econdincludedir) $(DESTDIR)$(eutilincludedir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -878,7 +950,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -893,14 +965,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -908,20 +978,12 @@ - install-data-am: install-econdincludeHEADERS install-errorDATA \ - install-eutilincludeHEADERS install-privsolibLTLIBRARIES - --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 -@@ -943,27 +1005,24 @@ - ps-am: - - uninstall-am: uninstall-econdincludeHEADERS uninstall-errorDATA \ -- uninstall-eutilincludeHEADERS uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+ uninstall-eutilincludeHEADERS uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-privsolibLTLIBRARIES ctags dist-hook \ -- 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 \ -+ clean-libtool clean-privsolibLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am \ - install-econdincludeHEADERS install-errorDATA \ - install-eutilincludeHEADERS install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -- 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-econdincludeHEADERS uninstall-errorDATA \ -- uninstall-eutilincludeHEADERS uninstall-privsolibLTLIBRARIES -+ install-info install-info-am install-man \ -+ install-privsolibLTLIBRARIES 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-econdincludeHEADERS \ -+ uninstall-errorDATA uninstall-eutilincludeHEADERS \ -+ uninstall-info-am uninstall-privsolibLTLIBRARIES - - @EVO_MARSHAL_RULE@ - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/filter/Makefile.in evolution-2.12.2/filter/Makefile.in ---- evolution-2.12.2.orig/filter/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/filter/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,64 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = filter --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(gladedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libfilter_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_libfilter_la_OBJECTS = filter-code.lo filter-colour.lo \ -- filter-datespec.lo filter-element.lo filter-file.lo \ -- filter-input.lo filter-int.lo filter-label.lo \ -- filter-marshal.lo filter-option.lo filter-part.lo \ -- filter-rule.lo rule-context.lo rule-editor.lo --libfilter_la_OBJECTS = $(am_libfilter_la_OBJECTS) --libfilter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libfilter_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libfilter_la_SOURCES) --DIST_SOURCES = $(libfilter_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -122,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -133,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -158,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -183,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -191,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -249,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -273,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -297,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -305,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -312,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -321,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -343,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -373,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -392,13 +384,12 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - glade_DATA = filter.glade -+ - INCLUDES = \ - -I $(top_srcdir) \ - -I $(top_srcdir)/e-util \ -@@ -407,9 +398,11 @@ - -DG_LOG_DOMAIN=\"filter\" \ - $(LIBFILTER_CFLAGS) - -+ - privsolib_LTLIBRARIES = \ - libfilter.la - -+ - libfilter_la_SOURCES = \ - filter-code.c \ - filter-code.h \ -@@ -440,12 +433,15 @@ - rule-editor.c \ - rule-editor.h - -+ - libfilter_la_LDFLAGS = $(NO_UNDEFINED) -+ - libfilter_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(LIBFILTER_LIBS) \ - $(REGEX_LIBS) - -+ - EXTRA_DIST = \ - $(glade_DATA) \ - filter.error.xml \ -@@ -456,75 +452,99 @@ - # basic rules. - error_DATA = filter.error - errordir = $(privdatadir)/errors -+ - MARSHAL_GENERATED = filter-marshal.c filter-marshal.h -+ - BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = filter -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libfilter_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la -+am_libfilter_la_OBJECTS = filter-code.lo filter-colour.lo \ -+ filter-datespec.lo filter-element.lo filter-file.lo \ -+ filter-input.lo filter-int.lo filter-label.lo filter-marshal.lo \ -+ filter-option.lo filter-part.lo filter-rule.lo rule-context.lo \ -+ rule-editor.lo -+libfilter_la_OBJECTS = $(am_libfilter_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/filter-code.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-colour.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-datespec.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-element.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-file.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-input.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-int.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-label.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-option.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-part.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/filter-rule.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rule-context.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rule-editor.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libfilter_la_SOURCES) -+DATA = $(error_DATA) $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(libfilter_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu filter/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu filter/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libfilter.la: $(libfilter_la_OBJECTS) $(libfilter_la_DEPENDENCIES) -- $(libfilter_la_LINK) -rpath $(privsolibdir) $(libfilter_la_OBJECTS) $(libfilter_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libfilter_la_LDFLAGS) $(libfilter_la_OBJECTS) $(libfilter_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -545,66 +565,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rule-editor.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -613,7 +659,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -625,11 +670,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -652,23 +696,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -683,10 +732,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -708,7 +756,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -723,14 +771,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -738,20 +784,12 @@ - install-data-am: install-errorDATA install-gladeDATA \ - install-privsolibLTLIBRARIES - --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 -@@ -772,25 +810,21 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-gladeDATA \ -+uninstall-am: uninstall-errorDATA uninstall-gladeDATA uninstall-info-am \ - uninstall-privsolibLTLIBRARIES - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-errorDATA install-exec install-exec-am \ -- install-gladeDATA install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-gladeDATA install-info \ -+ install-info-am install-man install-privsolibLTLIBRARIES \ - 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-errorDATA uninstall-gladeDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ -+ uninstall-gladeDATA uninstall-info-am \ - uninstall-privsolibLTLIBRARIES - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/help/Makefile.in evolution-2.12.2/help/Makefile.in ---- evolution-2.12.2.orig/help/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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. -@@ -37,11 +37,17 @@ - # the same distribution terms that you use for the rest of that program. - - ################################################################################ -+ -+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 -@@ -53,38 +59,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- $(top_srcdir)/gnome-doc-utils.make ChangeLog --subdir = help --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +99,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +112,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +161,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +188,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +204,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +261,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +289,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +315,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +324,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +333,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +341,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +361,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +390,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,11 +408,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = quickref - _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) -@@ -401,9 +418,12 @@ - $(filter $(LINGUAS),$(DOC_LINGUAS)), \ - $(DOC_LINGUAS)) - -+ - _DOC_ABS_SRCDIR = @abs_srcdir@ -+ - @ENABLE_SK_TRUE@_ENABLE_SK = true - -+ - ################################################################################ - db2omf_args = \ - --stringparam db2omf.basename $(DOC_MODULE) \ -@@ -419,10 +439,13 @@ - --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ - $(_db2omf) $(2) - -+ - _DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) -+ - _DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) - -+ - _DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) - -@@ -433,17 +456,23 @@ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) - - -+ - ################################################################################ - _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) -+ - _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) -+ - _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) -+ - _DOC_C_DOCS = \ - $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ - $(_DOC_C_MODULE) - -+ - _DOC_C_DOCS_NOENT = \ - $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) - -+ - _DOC_C_FIGURES = $(if $(DOC_FIGURES), \ - $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) -@@ -457,13 +486,16 @@ - C/$(f).xhtml) - - -+ - ############################################################################### - _DOC_POFILES = $(if $(DOC_MODULE), \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) - -+ - _DOC_LC_MODULES = $(if $(DOC_MODULE), \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) - -+ - _DOC_LC_INCLUDES = \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ - $(lc)/$(notdir $(inc)) )) -@@ -474,28 +506,36 @@ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ - $(lc)/$(notdir $(doc)) )) - -+ - _DOC_LC_DOCS = \ - $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) - -+ - _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ - $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) - -+ - _DOC_SRC_FIGURES = \ - $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ - $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) - -+ - _DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) - -+ - ################################################################################ - _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ - $(_DOC_C_HTML) $(_DOC_LC_HTML)) - -+ - _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) -+ - _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) - _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) - _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) - _clean_dir = $(if $(DOC_MODULE),clean-doc-dir) -+ - DOC_MODULE = evolution - DOC_ENTITIES = - DOC_INCLUDES = -@@ -614,39 +654,31 @@ - figures/ver_view_a.png \ - figures/vfolder-createrule-fig.png - -+ - DOC_LINGUAS = de el en_GB es fr oc ru sv -+subdir = help -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gnome-doc-utils.make \ -+ ChangeLog Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -654,6 +686,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, -@@ -661,13 +697,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -679,20 +709,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -713,7 +738,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -724,6 +749,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -732,22 +765,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -757,11 +787,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -784,23 +813,29 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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 \ -+ $(mkinstalldirs) $(distdir)/.. -+ @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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -811,19 +846,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -836,6 +867,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -855,7 +887,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -866,35 +898,25 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-local \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-libtool \ -+ distclean-local distclean-tags - - dvi: dvi-recursive - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: install-data-local - --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 -@@ -915,26 +937,27 @@ - - ps-am: - --uninstall-am: uninstall-local -+uninstall-am: uninstall-info-am uninstall-local - --.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-local ctags ctags-recursive dist-hook distclean \ -- distclean-generic distclean-libtool distclean-local \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am \ -- install-data-local install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-local mostlyclean \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ -- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -- uninstall-local -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-local clean-recursive ctags \ -+ ctags-recursive distclean distclean-generic distclean-libtool \ -+ distclean-local distclean-recursive distclean-tags distdir dvi \ -+ dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-local \ -+ install-data-recursive install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-local \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-local mostlyclean-recursive pdf \ -+ pdf-am pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-local uninstall-recursive - - - DOC_H_FILE ?= -diff -ruN evolution-2.12.2.orig/help/quickref/C/Makefile.in evolution-2.12.2/help/quickref/C/Makefile.in ---- evolution-2.12.2.orig/help/quickref/C/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/C/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/C --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/C - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/C -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/C/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/C/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/de/Makefile.in evolution-2.12.2/help/quickref/de/Makefile.in ---- evolution-2.12.2.orig/help/quickref/de/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/de/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/de --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/de - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/de -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/de/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/de/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/es/Makefile.in evolution-2.12.2/help/quickref/es/Makefile.in ---- evolution-2.12.2.orig/help/quickref/es/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/es/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/es --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/es - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/es -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/es/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/es/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/fr/Makefile.in evolution-2.12.2/help/quickref/fr/Makefile.in ---- evolution-2.12.2.orig/help/quickref/fr/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/fr/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/fr --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/fr - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/fr -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/fr/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/fr/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/it/Makefile.in evolution-2.12.2/help/quickref/it/Makefile.in ---- evolution-2.12.2.orig/help/quickref/it/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/it/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/it --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/it - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/it -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/it/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/it/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/Makefile.in evolution-2.12.2/help/quickref/Makefile.in ---- evolution-2.12.2.orig/help/quickref/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,46 +384,34 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = C de es fr it pl pt sv sq -+ - EXTRA_DIST = evolution-logo.eps -+subdir = help/quickref -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -410,6 +419,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, -@@ -417,13 +430,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -435,20 +442,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -469,7 +471,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -480,6 +482,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -488,22 +498,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -513,11 +520,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -540,23 +546,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -567,19 +578,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -589,6 +596,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -608,7 +616,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -619,34 +627,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -665,24 +664,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/help/quickref/pl/Makefile.in evolution-2.12.2/help/quickref/pl/Makefile.in ---- evolution-2.12.2.orig/help/quickref/pl/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/pl/Makefile.in 2007-12-05 15:54:54.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/pl --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/pl - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/pl -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/pl/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/pl/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/pt/Makefile.in evolution-2.12.2/help/quickref/pt/Makefile.in ---- evolution-2.12.2.orig/help/quickref/pt/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/pt/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/pt --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/pt - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/pt -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/pt/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/pt/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/sq/Makefile.in evolution-2.12.2/help/quickref/sq/Makefile.in ---- evolution-2.12.2.orig/help/quickref/sq/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/sq/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/sq --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/sq - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/sq -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/sq/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/sq/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/help/quickref/sv/Makefile.in evolution-2.12.2/help/quickref/sv/Makefile.in ---- evolution-2.12.2.orig/help/quickref/sv/Makefile.in 2007-12-05 15:50:00.000000000 +0100 -+++ evolution-2.12.2/help/quickref/sv/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = help/quickref/sv --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(quickrefdir)" --quickrefDATA_INSTALL = $(INSTALL_DATA) --DATA = $(quickref_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,73 +384,62 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - HELP_FILES = quickref.pdf -+ - quickrefdir = $(evolutionhelpdir)/quickref/sv - quickref_DATA = $(HELP_FILES) -+ - EXTRA_DIST = \ - $(HELP_FILES) \ - quickref.tex - -+subdir = help/quickref/sv -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(quickref_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/quickref/sv/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/quickref/sv/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+quickrefDATA_INSTALL = $(INSTALL_DATA) - install-quickrefDATA: $(quickref_DATA) - @$(NORMAL_INSTALL) -- test -z "$(quickrefdir)" || $(MKDIR_P) "$(DESTDIR)$(quickrefdir)" -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - @list='$(quickref_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(quickrefDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- $(quickrefDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f"; \ -+ $(quickrefDATA_INSTALL) $$d$$p $(DESTDIR)$(quickrefdir)/$$f; \ - done - - uninstall-quickrefDATA: - @$(NORMAL_UNINSTALL) - @list='$(quickref_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(quickrefdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(quickrefdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(quickrefdir)/$$f"; \ -+ rm -f $(DESTDIR)$(quickrefdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -435,23 +447,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -465,10 +482,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(quickrefdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(quickrefdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -488,7 +504,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -499,34 +515,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-quickrefDATA - --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 -@@ -545,21 +551,17 @@ - - ps-am: - --uninstall-am: uninstall-quickrefDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-quickrefDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-quickrefDATA \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-quickrefDATA -+ dvi-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-quickrefDATA install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-quickrefDATA - - # 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 -ruN evolution-2.12.2.orig/mail/default/C/Makefile.in evolution-2.12.2/mail/default/C/Makefile.in ---- evolution-2.12.2.orig/mail/default/C/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/C/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/C --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/C/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/C -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/C/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/C/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/de/Makefile.in evolution-2.12.2/mail/default/de/Makefile.in ---- evolution-2.12.2.orig/mail/default/de/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/de/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/de --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/de/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/de -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/de/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/de/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/es/Makefile.in evolution-2.12.2/mail/default/es/Makefile.in ---- evolution-2.12.2.orig/mail/default/es/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/es/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/es --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/es/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/es -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/es/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/es/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/fi/Makefile.in evolution-2.12.2/mail/default/fi/Makefile.in ---- evolution-2.12.2.orig/mail/default/fi/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/fi/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/fi --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/fi/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/fi -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/fi/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/fi/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/fr/Makefile.in evolution-2.12.2/mail/default/fr/Makefile.in ---- evolution-2.12.2.orig/mail/default/fr/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/mail/default/fr/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/fr --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/fr/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/fr -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/fr/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/fr/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/ja/Makefile.in evolution-2.12.2/mail/default/ja/Makefile.in ---- evolution-2.12.2.orig/mail/default/ja/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/mail/default/ja/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/ja --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/ja/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/ja -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/ja/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/ja/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/lt/Makefile.in evolution-2.12.2/mail/default/lt/Makefile.in ---- evolution-2.12.2.orig/mail/default/lt/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/lt/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/lt --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/lt/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/lt -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/lt/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/lt/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/Makefile.in evolution-2.12.2/mail/default/Makefile.in ---- evolution-2.12.2.orig/mail/default/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,33 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - SUBDIRS = C zh_CN de es fi fr ja lt mk nl pl pt sv -+subdir = mail/default -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +418,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, -@@ -416,13 +429,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +441,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +470,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +481,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +497,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +519,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +545,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +577,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +595,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +615,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +626,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +663,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/mail/default/mk/Makefile.in evolution-2.12.2/mail/default/mk/Makefile.in ---- evolution-2.12.2.orig/mail/default/mk/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/mk/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/mk --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/mk/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/mk -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/mk/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/mk/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/nl/Makefile.in evolution-2.12.2/mail/default/nl/Makefile.in ---- evolution-2.12.2.orig/mail/default/nl/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/nl/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/nl --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/nl/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/nl -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/nl/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/nl/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/pl/Makefile.in evolution-2.12.2/mail/default/pl/Makefile.in ---- evolution-2.12.2.orig/mail/default/pl/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/pl/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/pl --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/pl/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/pl -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/pl/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/pl/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/pt/Makefile.in evolution-2.12.2/mail/default/pt/Makefile.in ---- evolution-2.12.2.orig/mail/default/pt/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/pt/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/pt --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/pt/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/pt -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/pt/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/pt/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/sv/Makefile.in evolution-2.12.2/mail/default/sv/Makefile.in ---- evolution-2.12.2.orig/mail/default/sv/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/sv/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/sv --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/sv/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/sv -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/sv/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/sv/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/default/zh_CN/Makefile.in evolution-2.12.2/mail/default/zh_CN/Makefile.in ---- evolution-2.12.2.orig/mail/default/zh_CN/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/default/zh_CN/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/default/zh_CN --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(defaultlocaldir)" --defaultlocalDATA_INSTALL = $(INSTALL_DATA) --DATA = $(defaultlocal_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,71 +384,61 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - defaultlocaldir = $(privdatadir)/default/zh_CN/mail/local -+ - defaultlocal_DATA = \ - Inbox - -+ - EXTRA_DIST = $(defaultlocal_DATA) -+subdir = mail/default/zh_CN -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(defaultlocal_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/default/zh_CN/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/default/zh_CN/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+defaultlocalDATA_INSTALL = $(INSTALL_DATA) - install-defaultlocalDATA: $(defaultlocal_DATA) - @$(NORMAL_INSTALL) -- test -z "$(defaultlocaldir)" || $(MKDIR_P) "$(DESTDIR)$(defaultlocaldir)" -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(defaultlocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- $(defaultlocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ $(defaultlocalDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - - uninstall-defaultlocalDATA: - @$(NORMAL_UNINSTALL) - @list='$(defaultlocal_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(defaultlocaldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(defaultlocaldir)/$$f"; \ -+ rm -f $(DESTDIR)$(defaultlocaldir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -433,23 +446,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -463,10 +481,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(defaultlocaldir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(defaultlocaldir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -486,7 +503,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -497,34 +514,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-defaultlocalDATA - --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 -@@ -543,21 +550,18 @@ - - ps-am: - --uninstall-am: uninstall-defaultlocalDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-defaultlocalDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-defaultlocalDATA \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-defaultlocalDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-defaultlocalDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-defaultlocalDATA \ -+ 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 -ruN evolution-2.12.2.orig/mail/importers/Makefile.in evolution-2.12.2/mail/importers/Makefile.in ---- evolution-2.12.2.orig/mail/importers/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/mail/importers/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail/importers --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_mail_importers_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) --am_libevolution_mail_importers_la_OBJECTS = mail-importer.lo \ -- elm-importer.lo pine-importer.lo evolution-mbox-importer.lo --libevolution_mail_importers_la_OBJECTS = \ -- $(am_libevolution_mail_importers_la_OBJECTS) --libevolution_mail_importers_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_mail_importers_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_mail_importers_la_SOURCES) --DIST_SOURCES = $(libevolution_mail_importers_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,14 +384,13 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la -+ - privsolib_LTLIBRARIES = libevolution-mail-importers.la -+ - INCLUDES = -I.. \ - -I$(srcdir)/.. \ - -I$(top_srcdir) \ -@@ -404,6 +400,7 @@ - -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - $(IMPORTERS_CFLAGS) - -+ - libevolution_mail_importers_la_SOURCES = \ - mail-importer.c \ - mail-importer.h \ -@@ -411,8 +408,10 @@ - pine-importer.c \ - evolution-mbox-importer.c - -+ - libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) - -+ - # these haven't been converted to plugins yet - # netscape-importer.c - # evolution-outlook-importer.c -@@ -422,71 +421,85 @@ - $(top_builddir)/filter/libfilter.la \ - $(IMPORTERS_LIBS) - -+subdir = mail/importers -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libevolution_mail_importers_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libevolution-mail.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/filter/libfilter.la -+@OS_WIN32_FALSE@libevolution_mail_importers_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/filter/libfilter.la -+am_libevolution_mail_importers_la_OBJECTS = mail-importer.lo \ -+ elm-importer.lo pine-importer.lo evolution-mbox-importer.lo -+libevolution_mail_importers_la_OBJECTS = \ -+ $(am_libevolution_mail_importers_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/elm-importer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mbox-importer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-importer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/pine-importer.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_mail_importers_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_mail_importers_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/importers/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/importers/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-mail-importers.la: $(libevolution_mail_importers_la_OBJECTS) $(libevolution_mail_importers_la_DEPENDENCIES) -- $(libevolution_mail_importers_la_LINK) -rpath $(privsolibdir) $(libevolution_mail_importers_la_OBJECTS) $(libevolution_mail_importers_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_mail_importers_la_LDFLAGS) $(libevolution_mail_importers_la_OBJECTS) $(libevolution_mail_importers_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -497,25 +510,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pine-importer.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -523,6 +548,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -531,7 +568,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -543,11 +579,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -570,23 +605,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -600,10 +640,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -623,7 +662,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +676,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -685,23 +714,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/mail/Makefile.in evolution-2.12.2/mail/Makefile.in ---- evolution-2.12.2.orig/mail/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/mail/Makefile.in 2007-12-05 15:54:55.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,111 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = mail --DIST_COMMON = $(mailinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(filterdir)" \ -- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" \ -- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" \ -- "$(DESTDIR)$(mailincludedir)" --componentLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(component_LTLIBRARIES) --am__DEPENDENCIES_1 = --am__objects_1 = Spell-common.lo Spell-skels.lo Spell-stubs.lo --am__objects_2 = --am__objects_3 = $(am__objects_1) $(am__objects_2) --am__objects_4 = Evolution-Mail-common.lo Evolution-Mail-skels.lo \ -- Evolution-Mail-stubs.lo --am__objects_5 = $(am__objects_4) $(am__objects_2) --am__objects_6 = em-marshal.lo --am__objects_7 = $(am__objects_2) --am_libevolution_mail_la_OBJECTS = $(am__objects_3) $(am__objects_5) \ -- $(am__objects_6) $(am__objects_7) e-searching-tokenizer.lo \ -- em-account-editor.lo em-account-prefs.lo em-composer-prefs.lo \ -- em-composer-utils.lo em-config.lo em-event.lo \ -- em-filter-context.lo em-filter-editor.lo \ -- em-filter-folder-element.lo em-filter-rule.lo \ -- em-filter-source-element.lo em-folder-browser.lo \ -- em-folder-properties.lo em-folder-selection-button.lo \ -- em-folder-selection.lo em-folder-selector.lo \ -- em-folder-tree-model.lo em-folder-tree.lo em-folder-utils.lo \ -- em-folder-view.lo em-format-hook.lo em-format-html-display.lo \ -- em-format-html-print.lo em-format-html.lo em-format-quote.lo \ -- em-format.lo em-html-stream.lo em-icon-stream.lo \ -- em-inline-filter.lo em-junk-hook.lo em-mailer-prefs.lo \ -- em-menu.lo em-message-browser.lo em-migrate.lo em-popup.lo \ -- em-search-context.lo em-stripsig-filter.lo \ -- em-subscribe-editor.lo em-sync-stream.lo em-utils.lo \ -- em-vfolder-context.lo em-vfolder-editor.lo em-vfolder-rule.lo \ -- em-vfs-stream.lo mail-autofilter.lo mail-component-factory.lo \ -- mail-component.lo mail-config-factory.lo mail-config.lo \ -- mail-crypto.lo mail-folder-cache.lo mail-mt.lo mail-ops.lo \ -- mail-send-recv.lo mail-session.lo mail-signature-editor.lo \ -- mail-tools.lo mail-vfolder.lo message-list.lo \ -- message-tag-editor.lo message-tag-followup.lo --libevolution_mail_la_OBJECTS = $(am_libevolution_mail_la_OBJECTS) --libevolution_mail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_mail_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_mail_la_SOURCES) --DIST_SOURCES = $(libevolution_mail_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 --errorDATA_INSTALL = $(INSTALL_DATA) --etspecDATA_INSTALL = $(INSTALL_DATA) --filterDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --idlDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --serverDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(etspec_DATA) $(filter_DATA) $(glade_DATA) \ -- $(idl_DATA) $(schema_DATA) $(server_DATA) --mailincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(mailinclude_HEADERS) --RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -- distclean-recursive maintainer-clean-recursive --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -170,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -181,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -206,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -231,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -239,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -297,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -321,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -345,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -353,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -360,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -369,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -391,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -421,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -440,14 +384,13 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = default importers -+ - mailincludedir = $(privincludedir)/mail -+ - INCLUDES = \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/e-text \ -@@ -477,10 +420,13 @@ - -DPREFIX=\""$(prefix)"\" \ - -DG_LOG_DOMAIN=\"evolution-mail\" - -+ - component_LTLIBRARIES = libevolution-mail.la - -+ - # Code generation for Spell.idl - SPELL_IDL = Spell.idl -+ - SPELL_IDL_GENERATED_H = \ - Spell.h - -@@ -503,6 +449,7 @@ - - MAIL_IDL_GENERATED = $(MAIL_IDL_GENERATED_C) $(MAIL_IDL_GENERATED_H) - -+ - # IDL install - idl_DATA = $(MAIL_IDL) - -@@ -545,6 +492,7 @@ - mail-vfolder.h - - -+ - # libevolution-mail - libevolution_mail_la_SOURCES = \ - $(SPELL_IDL_GENERATED) \ -@@ -642,10 +590,12 @@ - message-tag-followup.c \ - message-tag-followup.h - -+ - @ENABLE_SMIME_TRUE@SMIME_LIBS = \ - @ENABLE_SMIME_TRUE@ $(top_builddir)/smime/lib/libessmime.la \ - @ENABLE_SMIME_TRUE@ $(top_builddir)/smime/gui/libevolution-smime.la - -+ - libevolution_mail_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ -@@ -666,11 +616,14 @@ - $(REGEX_LIBS) \ - $(THREADS_LIBS) - -+ - libevolution_mail_la_LDFLAGS = \ - -avoid-version -module $(NO_UNDEFINED) - -+ - libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h - -+ - # .server files - server_in_files = GNOME_Evolution_Mail.server.in.in - server_DATA = $(server_in_files:.server.in.in=.server) -@@ -678,11 +631,15 @@ - # Misc data to install - filterdir = $(privdatadir) - filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml -+ - error_DATA = mail.error - errordir = $(privdatadir)/errors -+ - glade_DATA = mail-config.glade mail-dialogs.glade - MARSHAL_GENERATED = em-marshal.c em-marshal.h -+ - etspec_DATA = message-list.etspec -+ - EXTRA_DIST = \ - ChangeLog.pre-1-4 \ - em-marshal.list \ -@@ -699,82 +656,197 @@ - em-filter-i18n.h - - -+ - # Purify support - @ENABLE_PURIFY_TRUE@PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - -+ - # GConf - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = evolution-mail.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MAIL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA) -+ - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+subdir = mail -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(component_LTLIBRARIES) -+ -+am__objects_1 = Spell-common.lo Spell-skels.lo Spell-stubs.lo -+am__objects_2 = -+am__objects_3 = $(am__objects_1) $(am__objects_2) -+am__objects_4 = Evolution-Mail-common.lo Evolution-Mail-skels.lo \ -+ Evolution-Mail-stubs.lo -+am__objects_5 = $(am__objects_4) $(am__objects_2) -+am__objects_6 = em-marshal.lo -+am__objects_7 = $(am__objects_2) -+am_libevolution_mail_la_OBJECTS = $(am__objects_3) $(am__objects_5) \ -+ $(am__objects_6) $(am__objects_7) e-searching-tokenizer.lo \ -+ em-account-editor.lo em-account-prefs.lo em-composer-prefs.lo \ -+ em-composer-utils.lo em-config.lo em-event.lo \ -+ em-filter-context.lo em-filter-editor.lo \ -+ em-filter-folder-element.lo em-filter-rule.lo \ -+ em-filter-source-element.lo em-folder-browser.lo \ -+ em-folder-properties.lo em-folder-selection-button.lo \ -+ em-folder-selection.lo em-folder-selector.lo \ -+ em-folder-tree-model.lo em-folder-tree.lo em-folder-utils.lo \ -+ em-folder-view.lo em-format-hook.lo em-format-html-display.lo \ -+ em-format-html-print.lo em-format-html.lo em-format-quote.lo \ -+ em-format.lo em-html-stream.lo em-icon-stream.lo \ -+ em-inline-filter.lo em-junk-hook.lo em-mailer-prefs.lo \ -+ em-menu.lo em-message-browser.lo em-migrate.lo em-popup.lo \ -+ em-search-context.lo em-stripsig-filter.lo \ -+ em-subscribe-editor.lo em-sync-stream.lo em-utils.lo \ -+ em-vfolder-context.lo em-vfolder-editor.lo em-vfolder-rule.lo \ -+ em-vfs-stream.lo mail-autofilter.lo mail-component-factory.lo \ -+ mail-component.lo mail-config-factory.lo mail-config.lo \ -+ mail-crypto.lo mail-folder-cache.lo mail-mt.lo mail-ops.lo \ -+ mail-send-recv.lo mail-session.lo mail-signature-editor.lo \ -+ mail-tools.lo mail-vfolder.lo message-list.lo \ -+ message-tag-editor.lo message-tag-followup.lo -+libevolution_mail_la_OBJECTS = $(am_libevolution_mail_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-Mail-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Mail-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-Mail-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Spell-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Spell-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Spell-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-searching-tokenizer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-account-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-account-prefs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-composer-prefs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-composer-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-config.Plo ./$(DEPDIR)/em-event.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-context.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-folder-element.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-rule.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-filter-source-element.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-browser.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-properties.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-selection-button.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-selection.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-selector.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-tree-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-tree.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-folder-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-format-hook.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-format-html-display.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-format-html-print.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-format-html.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-format-quote.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-format.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-html-stream.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-icon-stream.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-inline-filter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-junk-hook.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-mailer-prefs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-marshal.Plo ./$(DEPDIR)/em-menu.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-message-browser.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-migrate.Plo ./$(DEPDIR)/em-popup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-search-context.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-stripsig-filter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-subscribe-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-sync-stream.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-vfolder-context.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-vfolder-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-vfolder-rule.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-vfs-stream.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-autofilter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-component-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-config-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-crypto.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-folder-cache.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-mt.Plo ./$(DEPDIR)/mail-ops.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-send-recv.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-session.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-signature-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-tools.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-vfolder.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/message-list.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/message-tag-editor.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/message-tag-followup.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_mail_la_SOURCES) -+DATA = $(error_DATA) $(etspec_DATA) $(filter_DATA) $(glade_DATA) \ -+ $(idl_DATA) $(schema_DATA) $(server_DATA) -+ -+HEADERS = $(mailinclude_HEADERS) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(mailinclude_HEADERS) $(srcdir)/Makefile.in ChangeLog \ -+ Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) -+SOURCES = $(libevolution_mail_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mail/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu mail/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+componentLTLIBRARIES_INSTALL = $(INSTALL) - install-componentLTLIBRARIES: $(component_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ - else :; fi; \ - done - - uninstall-componentLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ - done - - clean-componentLTLIBRARIES: - -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-mail.la: $(libevolution_mail_la_OBJECTS) $(libevolution_mail_la_DEPENDENCIES) -- $(libevolution_mail_la_LINK) -rpath $(componentdir) $(libevolution_mail_la_OBJECTS) $(libevolution_mail_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(componentdir) $(libevolution_mail_la_LDFLAGS) $(libevolution_mail_la_OBJECTS) $(libevolution_mail_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -850,166 +922,190 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message-tag-followup.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+etspecDATA_INSTALL = $(INSTALL_DATA) - install-etspecDATA: $(etspec_DATA) - @$(NORMAL_INSTALL) -- test -z "$(etspecdir)" || $(MKDIR_P) "$(DESTDIR)$(etspecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(etspecdir) - @list='$(etspec_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(etspecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etspecdir)/$$f'"; \ -- $(etspecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f"; \ -+ $(etspecDATA_INSTALL) $$d$$p $(DESTDIR)$(etspecdir)/$$f; \ - done - - uninstall-etspecDATA: - @$(NORMAL_UNINSTALL) - @list='$(etspec_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(etspecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(etspecdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(etspecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(etspecdir)/$$f; \ - done -+filterDATA_INSTALL = $(INSTALL_DATA) - install-filterDATA: $(filter_DATA) - @$(NORMAL_INSTALL) -- test -z "$(filterdir)" || $(MKDIR_P) "$(DESTDIR)$(filterdir)" -+ $(mkinstalldirs) $(DESTDIR)$(filterdir) - @list='$(filter_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(filterDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(filterdir)/$$f'"; \ -- $(filterDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(filterdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(filterDATA_INSTALL) $$d$$p $(DESTDIR)$(filterdir)/$$f"; \ -+ $(filterDATA_INSTALL) $$d$$p $(DESTDIR)$(filterdir)/$$f; \ - done - - uninstall-filterDATA: - @$(NORMAL_UNINSTALL) - @list='$(filter_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(filterdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(filterdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(filterdir)/$$f"; \ -+ rm -f $(DESTDIR)$(filterdir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+idlDATA_INSTALL = $(INSTALL_DATA) - install-idlDATA: $(idl_DATA) - @$(NORMAL_INSTALL) -- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" -+ $(mkinstalldirs) $(DESTDIR)$(idldir) - @list='$(idl_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ -- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ -+ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ - done - - uninstall-idlDATA: - @$(NORMAL_UNINSTALL) - @list='$(idl_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ -+ rm -f $(DESTDIR)$(idldir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done -+serverDATA_INSTALL = $(INSTALL_DATA) - install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) -- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" -+ $(mkinstalldirs) $(DESTDIR)$(serverdir) - @list='$(server_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ -- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ -+ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ - done - - uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ -+ rm -f $(DESTDIR)$(serverdir)/$$f; \ - done -+mailincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-mailincludeHEADERS: $(mailinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(mailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(mailincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(mailincludedir) - @list='$(mailinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(mailincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(mailincludedir)/$$f'"; \ -- $(mailincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(mailincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(mailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(mailincludedir)/$$f"; \ -+ $(mailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(mailincludedir)/$$f; \ - done - - uninstall-mailincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(mailinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(mailincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(mailincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(mailincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(mailincludedir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -1019,13 +1115,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1037,20 +1127,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1071,7 +1156,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1082,6 +1167,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -1090,22 +1183,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -1115,11 +1205,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -1142,23 +1231,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -1169,19 +1263,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -1192,13 +1282,11 @@ - check-am: all-am - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive --@ENABLE_PURIFY_FALSE@all-local: - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(etspecdir)" "$(DESTDIR)$(filterdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(mailincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(errordir) $(DESTDIR)$(etspecdir) $(DESTDIR)$(filterdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(idldir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) $(DESTDIR)$(mailincludedir) -+ - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -1220,7 +1308,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -1236,14 +1324,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: -@@ -1253,20 +1339,12 @@ - install-gladeDATA install-idlDATA install-mailincludeHEADERS \ - install-schemaDATA install-serverDATA - --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 -@@ -1289,33 +1367,35 @@ - - uninstall-am: uninstall-componentLTLIBRARIES uninstall-errorDATA \ - uninstall-etspecDATA uninstall-filterDATA uninstall-gladeDATA \ -- uninstall-idlDATA uninstall-mailincludeHEADERS \ -- uninstall-schemaDATA uninstall-serverDATA -- --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -- install-strip -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am all-local check check-am clean \ -- clean-componentLTLIBRARIES clean-generic clean-libtool ctags \ -- ctags-recursive dist-hook distclean distclean-compile \ -- distclean-generic distclean-libtool distclean-tags distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -+ uninstall-idlDATA uninstall-info-am \ -+ uninstall-mailincludeHEADERS uninstall-schemaDATA \ -+ uninstall-serverDATA -+ -+uninstall-info: uninstall-info-recursive -+ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ -+ check-am clean clean-componentLTLIBRARIES clean-generic \ -+ clean-libtool clean-recursive ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ - install-componentLTLIBRARIES install-data install-data-am \ -- install-data-local install-dvi install-dvi-am \ -- install-errorDATA install-etspecDATA install-exec \ -- install-exec-am install-filterDATA install-gladeDATA \ -- install-html install-html-am install-idlDATA install-info \ -- install-info-am install-mailincludeHEADERS install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-schemaDATA install-serverDATA install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -+ install-data-local install-data-recursive install-errorDATA \ -+ install-etspecDATA install-exec install-exec-am \ -+ install-exec-recursive install-filterDATA install-gladeDATA \ -+ install-idlDATA install-info install-info-am \ -+ install-info-recursive install-mailincludeHEADERS install-man \ -+ install-recursive install-schemaDATA install-serverDATA \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ -+ ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-componentLTLIBRARIES uninstall-errorDATA \ - uninstall-etspecDATA uninstall-filterDATA uninstall-gladeDATA \ -- uninstall-idlDATA uninstall-mailincludeHEADERS \ -+ uninstall-idlDATA uninstall-info-am uninstall-info-recursive \ -+ uninstall-mailincludeHEADERS uninstall-recursive \ - uninstall-schemaDATA uninstall-serverDATA - - -diff -ruN evolution-2.12.2.orig/Makefile.in evolution-2.12.2/Makefile.in ---- evolution-2.12.2.orig/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/Makefile.in 2007-12-05 15:54:50.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,67 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = . --DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -- $(srcdir)/evolution-plugin.pc.in \ -- $(srcdir)/evolution-shell.pc.in $(srcdir)/evolution-zip.in \ -- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ -- config.guess config.sub depcomp install-sh ltmain.sh missing \ -- mkinstalldirs --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -- configure.lineno config.status.lineno --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = evolution-zip evolution-shell.pc \ -- evolution-plugin.pc --SOURCES = --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 --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(pkgconfigdir)" --pkgconfigDATA_INSTALL = $(INSTALL_DATA) --DATA = $(pkgconfig_DATA) --RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -- distclean-recursive maintainer-clean-recursive --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = win32 data e-util a11y widgets shell filter smime \ -- addressbook calendar art composer mail plugins ui views tools \ -- help po --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --distdir = $(PACKAGE)-$(VERSION) --top_distdir = $(distdir) --am__remove_distdir = \ -- { test ! -d $(distdir) \ -- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr $(distdir); }; } --DIST_ARCHIVES = $(distdir).tar.gz --GZIP_ENV = --best --distuninstallcheck_listfiles = find . -type f -print --distcleancheck_listfiles = find . -type f -print - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -124,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -135,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -160,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -185,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -193,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -251,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -275,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -299,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -307,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -314,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -323,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -345,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -375,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -394,21 +384,20 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - changelogs = \ - ChangeLog \ - ChangeLog.pre-1-4 - -+ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = \ - evolution-shell.pc \ - evolution-plugin.pc - -+ - EXTRA_DIST = \ - AUTHORS \ - $(changelogs) \ -@@ -429,7 +418,9 @@ - gnome-doc-utils.make \ - $(pkgconfig_DATA:.pc=.pc.in) - -+ - @ENABLE_SMIME_TRUE@SMIME_DIR = smime -+ - SUBDIRS = \ - win32 \ - data \ -@@ -451,6 +442,7 @@ - help \ - po - -+ - DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ -@@ -463,65 +455,72 @@ - # Scrollkeeper must be disabled for distcheck to work because - # distcheck uses a custom prefix. See GNOME bug #354357. - DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper -+subdir = . -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = evolution-zip evolution-shell.pc \ -+ evolution-plugin.pc -+DIST_SOURCES = -+DATA = $(pkgconfig_DATA) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ -+ COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \ -+ aclocal.m4 config.guess config.h.in config.sub configure \ -+ configure.in depcomp evolution-plugin.pc.in \ -+ evolution-shell.pc.in evolution-zip.in install-sh ltmain.sh \ -+ missing mkinstalldirs -+DIST_SUBDIRS = win32 data e-util a11y widgets shell filter smime \ -+ addressbook calendar art composer mail plugins ui views tools \ -+ help po - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: --am--refresh: -- @: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -- cd $(srcdir) && $(AUTOMAKE) --gnu \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -+ -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- echo ' $(SHELL) ./config.status'; \ -- $(SHELL) ./config.status;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ -- esac; -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) - --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - - config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ -- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ -+ $(MAKE) stamp-h1; \ - else :; fi - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h --$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) -- rm -f stamp-h1 -- touch $@ -+ touch $(srcdir)/config.h.in - - distclean-hdr: - -rm -f config.h stamp-h1 --evolution-zip: $(top_builddir)/config.status $(srcdir)/evolution-zip.in -+evolution-zip: $(top_builddir)/config.status evolution-zip.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --evolution-shell.pc: $(top_builddir)/config.status $(srcdir)/evolution-shell.pc.in -+evolution-shell.pc: $(top_builddir)/config.status evolution-shell.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --evolution-plugin.pc: $(top_builddir)/config.status $(srcdir)/evolution-plugin.pc.in -+evolution-plugin.pc: $(top_builddir)/config.status evolution-plugin.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - - mostlyclean-libtool: -@@ -532,22 +531,24 @@ - - distclean-libtool: - -rm -f libtool -+uninstall-info-am: -+pkgconfigDATA_INSTALL = $(INSTALL_DATA) - install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) -- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" -+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ -- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ -+ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ - done - - uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ -+ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -557,13 +558,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -575,20 +570,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -609,7 +599,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -620,6 +610,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -628,22 +626,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -653,11 +648,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -680,25 +674,40 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = . -+distdir = $(PACKAGE)-$(VERSION) -+ -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+ -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print - - distdir: $(DISTFILES) - $(am__remove_distdir) -- test -d $(distdir) || mkdir $(distdir) -- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -- list='$(DISTFILES)'; \ -- dist_files=`for file in $$list; do echo $$file; done | \ -- sed -e "s|^$$srcdirstrip/||;t" \ -- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -- case $$dist_files in \ -- */*) $(MKDIR_P) `echo "$$dist_files" | \ -- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -- sort -u` ;; \ -- esac; \ -- for file in $$dist_files; do \ -+ mkdir $(distdir) -+ $(mkinstalldirs) $(distdir)/. $(distdir)/addressbook/tools $(distdir)/data/cde_app_root/dt/appconfig/types/C $(distdir)/po $(distdir)/shell -+ @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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -711,17 +720,13 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -729,49 +734,22 @@ - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir -- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- $(am__remove_distdir) -- --dist-bzip2: distdir -- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -- $(am__remove_distdir) -- --dist-tarZ: distdir -- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -- $(am__remove_distdir) -- --dist-shar: distdir -- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -- $(am__remove_distdir) -- --dist-zip: distdir -- -rm -f $(distdir).zip -- zip -rq $(distdir).zip $(distdir) -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - dist dist-all: distdir -- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist -- case '$(DIST_ARCHIVES)' in \ -- *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -- *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -- *.tar.Z*) \ -- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ -- *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -- *.zip*) \ -- unzip $(distdir).zip ;;\ -- esac -+ $(am__remove_distdir) -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst -@@ -791,20 +769,19 @@ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ -- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ -+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ -- && $(MAKE) $(AM_MAKEFLAGS) dist \ -- && rm -rf $(DIST_ARCHIVES) \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ -+ && rm -f $(distdir).tar.gz \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) -- @(echo "$(distdir) archives ready for distribution: "; \ -- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -+ @echo "$(distdir).tar.gz is ready for distribution" | \ -+ sed 'h;s/./=/g;p;x;p;x' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -828,9 +805,8 @@ - all-am: Makefile $(DATA) config.h - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -850,7 +826,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -863,35 +839,25 @@ - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-hdr \ -- distclean-libtool distclean-tags -+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ -+ distclean-tags - - dvi: dvi-recursive - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: install-pkgconfigDATA - --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 -@@ -912,27 +878,29 @@ - - ps-am: - --uninstall-am: uninstall-pkgconfigDATA -+uninstall-am: uninstall-info-am uninstall-pkgconfigDATA - --.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 am--refresh check check-am clean clean-generic \ -- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive dist dist-all dist-gzip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-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-pkgconfigDATA install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am tags tags-recursive uninstall uninstall-am \ -- uninstall-pkgconfigDATA -+ distclean-recursive distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ -+ info-recursive install install-am install-data install-data-am \ -+ install-data-recursive install-exec install-exec-am \ -+ install-exec-recursive install-info install-info-am \ -+ install-info-recursive install-man install-pkgconfigDATA \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-pkgconfigDATA \ -+ uninstall-recursive - - - # CDE Stuff -diff -ruN evolution-2.12.2.orig/plugins/addressbook-file/Makefile.in evolution-2.12.2/plugins/addressbook-file/Makefile.in ---- evolution-2.12.2.orig/plugins/addressbook-file/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/addressbook-file/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/addressbook-file --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_addressbook_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am_liborg_gnome_addressbook_file_la_OBJECTS = addressbook-file.lo --liborg_gnome_addressbook_file_la_OBJECTS = \ -- $(am_liborg_gnome_addressbook_file_la_OBJECTS) --liborg_gnome_addressbook_file_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_addressbook_file_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,92 +384,99 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - plugin_DATA = org-gnome-addressbook-file.eplug - plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la -+ - liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c - liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_addressbook_file_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - EXTRA_DIST = org-gnome-addressbook-file.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/addressbook-file -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_addressbook_file_la_DEPENDENCIES = -+am_liborg_gnome_addressbook_file_la_OBJECTS = addressbook-file.lo -+liborg_gnome_addressbook_file_la_OBJECTS = \ -+ $(am_liborg_gnome_addressbook_file_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addressbook-file.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_addressbook_file_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/addressbook-file/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/addressbook-file/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-addressbook-file.la: $(liborg_gnome_addressbook_file_la_OBJECTS) $(liborg_gnome_addressbook_file_la_DEPENDENCIES) -- $(liborg_gnome_addressbook_file_la_LINK) -rpath $(plugindir) $(liborg_gnome_addressbook_file_la_OBJECTS) $(liborg_gnome_addressbook_file_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_addressbook_file_la_LDFLAGS) $(liborg_gnome_addressbook_file_la_OBJECTS) $(liborg_gnome_addressbook_file_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -480,49 +484,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addressbook-file.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -531,7 +560,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -543,11 +571,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -570,23 +597,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -601,10 +633,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -626,7 +657,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -641,34 +672,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -689,23 +710,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/attachment-reminder/Makefile.in evolution-2.12.2/plugins/attachment-reminder/Makefile.in ---- evolution-2.12.2.orig/plugins/attachment-reminder/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/attachment-reminder/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,64 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/attachment-reminder --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_evolution_attachment_reminder_la_LIBADD = --am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ -- attachment-reminder.lo --liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS) --liborg_gnome_evolution_attachment_reminder_la_LINK = $(LIBTOOL) \ -- --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ -- $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_attachment_reminder_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) --DIST_SOURCES = \ -- $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -122,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -133,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -158,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -183,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -191,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -249,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -273,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -297,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -305,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -312,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -321,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -343,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -373,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -392,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_builddir)/composer \ -@@ -404,96 +393,113 @@ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" - -+ - error_DATA = \ - org-gnome-attachment-reminder.error - -+ - errordir = $(privdatadir)/errors -+ - plugin_DATA = \ - org-gnome-evolution-attachment-reminder.eplug \ - attachment-reminder.glade - -+ - plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la -+ - liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c - liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version -+ - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = apps-evolution-attachment-reminder.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \ - org-gnome-attachment-reminder.error.xml \ - $(schema_in_files) \ - attachment-reminder.glade - -+ - BUILT_SOURCES = org-gnome-evolution-attachment-reminder.eplug \ - org-gnome-attachment-reminder.error - -+ - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+subdir = plugins/attachment-reminder -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_attachment_reminder_la_LIBADD = -+am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ -+ attachment-reminder.lo -+liborg_gnome_evolution_attachment_reminder_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_attachment_reminder_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attachment-reminder.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) -+DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_attachment_reminder_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/attachment-reminder/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/attachment-reminder/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-attachment-reminder.la: $(liborg_gnome_evolution_attachment_reminder_la_OBJECTS) $(liborg_gnome_evolution_attachment_reminder_la_DEPENDENCIES) -- $(liborg_gnome_evolution_attachment_reminder_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_attachment_reminder_la_OBJECTS) $(liborg_gnome_evolution_attachment_reminder_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_attachment_reminder_la_LDFLAGS) $(liborg_gnome_evolution_attachment_reminder_la_OBJECTS) $(liborg_gnome_evolution_attachment_reminder_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -501,83 +507,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attachment-reminder.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -586,7 +619,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -598,11 +630,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -625,23 +656,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -656,10 +692,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -681,7 +716,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -697,36 +732,25 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - --install-data-am: install-data-local install-errorDATA \ -- install-pluginDATA install-pluginLTLIBRARIES \ -- install-schemaDATA -- --install-dvi: install-dvi-am -+install-data-am: install-data-local install-errorDATA install-pluginDATA \ -+ install-pluginLTLIBRARIES install-schemaDATA - - 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 -@@ -747,26 +771,22 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA - --.MAKE: install-am install-strip -- - .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-data-local install-dvi install-dvi-am \ -- install-errorDATA 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-ps install-ps-am \ -- install-schemaDATA 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-errorDATA uninstall-pluginDATA \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-data-local \ -+ install-errorDATA install-exec install-exec-am install-info \ -+ install-info-am install-man install-pluginDATA \ -+ install-pluginLTLIBRARIES install-schemaDATA 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-errorDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA - - -diff -ruN evolution-2.12.2.orig/plugins/audio-inline/Makefile.in evolution-2.12.2/plugins/audio-inline/Makefile.in ---- evolution-2.12.2.orig/plugins/audio-inline/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/audio-inline/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/audio-inline --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_audio_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am_liborg_gnome_audio_inline_la_OBJECTS = audio-inline.lo --liborg_gnome_audio_inline_la_OBJECTS = \ -- $(am_liborg_gnome_audio_inline_la_OBJECTS) --liborg_gnome_audio_inline_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_audio_inline_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,91 +384,98 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GSTREAMER_CFLAGS) - -+ - plugin_DATA = org-gnome-audio-inline.eplug - plugin_LTLIBRARIES = liborg-gnome-audio-inline.la -+ - liborg_gnome_audio_inline_la_SOURCES = audio-inline.c - liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version - liborg_gnome_audio_inline_la_LIBADD = $(GSTREAMER_LIBS) -+ - EXTRA_DIST = org-gnome-audio-inline.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/audio-inline -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_audio_inline_la_DEPENDENCIES = -+am_liborg_gnome_audio_inline_la_OBJECTS = audio-inline.lo -+liborg_gnome_audio_inline_la_OBJECTS = \ -+ $(am_liborg_gnome_audio_inline_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio-inline.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_audio_inline_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/audio-inline/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/audio-inline/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-audio-inline.la: $(liborg_gnome_audio_inline_la_OBJECTS) $(liborg_gnome_audio_inline_la_DEPENDENCIES) -- $(liborg_gnome_audio_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_audio_inline_la_OBJECTS) $(liborg_gnome_audio_inline_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_audio_inline_la_LDFLAGS) $(liborg_gnome_audio_inline_la_OBJECTS) $(liborg_gnome_audio_inline_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -479,49 +483,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio-inline.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -530,7 +559,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -542,11 +570,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -569,23 +596,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -600,10 +632,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -625,7 +656,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -640,34 +671,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -688,23 +709,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/backup-restore/Makefile.in evolution-2.12.2/plugins/backup-restore/Makefile.in ---- evolution-2.12.2.orig/plugins/backup-restore/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/backup-restore/Makefile.in 2007-12-05 15:54:57.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,70 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --privlibexec_PROGRAMS = evolution-backup$(EXEEXT) --subdir = plugins/backup-restore --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" \ -- "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_backup_restore_la_LIBADD = --am_liborg_gnome_backup_restore_la_OBJECTS = backup-restore.lo --liborg_gnome_backup_restore_la_OBJECTS = \ -- $(am_liborg_gnome_backup_restore_la_OBJECTS) --liborg_gnome_backup_restore_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_backup_restore_la_LDFLAGS) $(LDFLAGS) -o $@ --privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --PROGRAMS = $(privlibexec_PROGRAMS) --am_evolution_backup_OBJECTS = backup.$(OBJEXT) --evolution_backup_OBJECTS = $(am_evolution_backup_OBJECTS) --am__DEPENDENCIES_1 = --evolution_backup_DEPENDENCIES = $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) \ -- $(evolution_backup_SOURCES) --DIST_SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) \ -- $(evolution_backup_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -129,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -140,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -165,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -190,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -198,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -280,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -304,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -312,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -319,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -328,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -350,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -380,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -399,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -@@ -416,97 +398,120 @@ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) - -+ - error_DATA = org-gnome-backup-restore.error - errordir = $(privdatadir)/errors -+ - plugin_DATA = org-gnome-backup-restore.eplug org-gnome-backup-restore.xml - plugin_LTLIBRARIES = liborg-gnome-backup-restore.la -+ - liborg_gnome_backup_restore_la_SOURCES = backup-restore.c - liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version -+ -+privlibexec_PROGRAMS = evolution-backup - evolution_backup_SOURCES = backup.c - evolution_backup_LDADD = $(SHELL_LIBS) -+ - EXTRA_DIST = \ - org-gnome-backup-restore.eplug.xml \ - org-gnome-backup-restore.error.xml \ - org-gnome-backup-restore.xml - -+ - BUILT_SOURCES = org-gnome-backup-restore.eplug \ - org-gnome-backup-restore.error - - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/backup-restore -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_backup_restore_la_LIBADD = -+am_liborg_gnome_backup_restore_la_OBJECTS = backup-restore.lo -+liborg_gnome_backup_restore_la_OBJECTS = \ -+ $(am_liborg_gnome_backup_restore_la_OBJECTS) -+privlibexec_PROGRAMS = evolution-backup$(EXEEXT) -+PROGRAMS = $(privlibexec_PROGRAMS) -+ -+am_evolution_backup_OBJECTS = backup.$(OBJEXT) -+evolution_backup_OBJECTS = $(am_evolution_backup_OBJECTS) -+evolution_backup_DEPENDENCIES = -+evolution_backup_LDFLAGS = -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backup-restore.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/backup.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) \ -+ $(evolution_backup_SOURCES) -+DATA = $(error_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_backup_restore_la_SOURCES) $(evolution_backup_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/backup-restore/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/backup-restore/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-backup-restore.la: $(liborg_gnome_backup_restore_la_OBJECTS) $(liborg_gnome_backup_restore_la_DEPENDENCIES) -- $(liborg_gnome_backup_restore_la_LINK) -rpath $(plugindir) $(liborg_gnome_backup_restore_la_OBJECTS) $(liborg_gnome_backup_restore_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_backup_restore_la_LDFLAGS) $(liborg_gnome_backup_restore_la_OBJECTS) $(liborg_gnome_backup_restore_la_LIBADD) $(LIBS) -+privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ - else :; fi; \ - done - -@@ -514,8 +519,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ - done - - clean-privlibexecPROGRAMS: -@@ -526,10 +531,10 @@ - done - evolution-backup$(EXEEXT): $(evolution_backup_OBJECTS) $(evolution_backup_DEPENDENCIES) - @rm -f evolution-backup$(EXEEXT) -- $(LINK) $(evolution_backup_OBJECTS) $(evolution_backup_LDADD) $(LIBS) -+ $(LINK) $(evolution_backup_LDFLAGS) $(evolution_backup_OBJECTS) $(evolution_backup_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -538,66 +543,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backup.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -606,7 +637,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -618,11 +648,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -645,23 +674,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -676,10 +710,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(privlibexecdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(privlibexecdir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -701,7 +734,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -716,14 +749,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -731,20 +762,12 @@ - install-data-am: install-errorDATA install-pluginDATA \ - install-pluginLTLIBRARIES - --install-dvi: install-dvi-am -- - install-exec-am: install-privlibexecPROGRAMS - --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 -@@ -765,28 +788,23 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-privlibexecPROGRAMS - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pluginLTLIBRARIES \ -- clean-privlibexecPROGRAMS 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-errorDATA install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pluginDATA \ -+ clean-libtool clean-pluginLTLIBRARIES clean-privlibexecPROGRAMS \ -+ ctags distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-errorDATA install-exec install-exec-am install-info \ -+ install-info-am install-man install-pluginDATA \ - install-pluginLTLIBRARIES install-privlibexecPROGRAMS \ -- install-ps install-ps-am 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-errorDATA \ -- uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ -- uninstall-privlibexecPROGRAMS -+ 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-errorDATA \ -+ uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES uninstall-privlibexecPROGRAMS - - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/plugins/bbdb/Makefile.in evolution-2.12.2/plugins/bbdb/Makefile.in ---- evolution-2.12.2.orig/plugins/bbdb/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/bbdb/Makefile.in 2007-12-05 15:54:57.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/bbdb --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_evolution_bbdb_la_LIBADD = --am_liborg_gnome_evolution_bbdb_la_OBJECTS = bbdb.lo gaimbuddies.lo --liborg_gnome_evolution_bbdb_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_bbdb_la_OBJECTS) --liborg_gnome_evolution_bbdb_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_bbdb_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_builddir)/composer \ -@@ -398,79 +393,89 @@ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) - -+ - plugin_DATA = org-gnome-evolution-bbdb.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la -+ - liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c - liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/bbdb -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_bbdb_la_LIBADD = -+am_liborg_gnome_evolution_bbdb_la_OBJECTS = bbdb.lo gaimbuddies.lo -+liborg_gnome_evolution_bbdb_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_bbdb_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bbdb.Plo ./$(DEPDIR)/gaimbuddies.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_bbdb_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/bbdb/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/bbdb/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-bbdb.la: $(liborg_gnome_evolution_bbdb_la_OBJECTS) $(liborg_gnome_evolution_bbdb_la_DEPENDENCIES) -- $(liborg_gnome_evolution_bbdb_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_bbdb_la_OBJECTS) $(liborg_gnome_evolution_bbdb_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_bbdb_la_LDFLAGS) $(liborg_gnome_evolution_bbdb_la_OBJECTS) $(liborg_gnome_evolution_bbdb_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -479,49 +484,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaimbuddies.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -530,7 +560,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -542,11 +571,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -569,23 +597,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -600,10 +633,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -625,7 +657,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -640,34 +672,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -688,23 +710,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/bogo-junk-plugin/Makefile.in evolution-2.12.2/plugins/bogo-junk-plugin/Makefile.in ---- evolution-2.12.2.orig/plugins/bogo-junk-plugin/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/bogo-junk-plugin/Makefile.in 2007-12-05 15:54:57.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,61 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/bogo-junk-plugin --DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ -- "$(DESTDIR)$(schemadir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_bogo_junk_plugin_la_LIBADD = --am_liborg_gnome_bogo_junk_plugin_la_OBJECTS = bf-junk-filter.lo --liborg_gnome_bogo_junk_plugin_la_OBJECTS = \ -- $(am_liborg_gnome_bogo_junk_plugin_la_OBJECTS) --liborg_gnome_bogo_junk_plugin_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_bogo_junk_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) $(schema_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -119,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -130,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -155,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -180,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -188,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -246,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -270,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -294,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -302,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -309,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -318,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -340,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -370,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -389,96 +384,106 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-bogo-junk-plugin.eplug - plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la -+ - liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c - liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = bogo-junk-plugin.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - BUILT_SOURCES = $(plugin_DATA) $(error_DATA) -+ - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+ - EXTRA_DIST = \ - org-gnome-bogo-junk-plugin.eplug.xml \ - $(schema_in_files) - -+subdir = plugins/bogo-junk-plugin -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_bogo_junk_plugin_la_LIBADD = -+am_liborg_gnome_bogo_junk_plugin_la_OBJECTS = bf-junk-filter.lo -+liborg_gnome_bogo_junk_plugin_la_OBJECTS = \ -+ $(am_liborg_gnome_bogo_junk_plugin_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bf-junk-filter.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) -+DATA = $(plugin_DATA) $(schema_DATA) -+ -+DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_bogo_junk_plugin_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/bogo-junk-plugin/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/bogo-junk-plugin/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-bogo-junk-plugin.la: $(liborg_gnome_bogo_junk_plugin_la_OBJECTS) $(liborg_gnome_bogo_junk_plugin_la_DEPENDENCIES) -- $(liborg_gnome_bogo_junk_plugin_la_LINK) -rpath $(plugindir) $(liborg_gnome_bogo_junk_plugin_la_OBJECTS) $(liborg_gnome_bogo_junk_plugin_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_bogo_junk_plugin_la_LDFLAGS) $(liborg_gnome_bogo_junk_plugin_la_OBJECTS) $(liborg_gnome_bogo_junk_plugin_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -486,66 +491,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bf-junk-filter.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -554,7 +585,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,11 +596,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -593,23 +622,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -624,10 +658,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -649,7 +682,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -665,14 +698,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -680,20 +711,12 @@ - install-data-am: install-data-local install-pluginDATA \ - install-pluginLTLIBRARIES install-schemaDATA - --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 -@@ -714,25 +737,21 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ -- uninstall-schemaDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES uninstall-schemaDATA - - .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-data-local 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-ps \ -- install-ps-am install-schemaDATA 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 \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-data-local \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pluginDATA install-pluginLTLIBRARIES \ -+ install-schemaDATA 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-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA - - -diff -ruN evolution-2.12.2.orig/plugins/caldav/Makefile.in evolution-2.12.2/plugins/caldav/Makefile.in ---- evolution-2.12.2.orig/plugins/caldav/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/caldav/Makefile.in 2007-12-05 15:54:57.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/caldav --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_evolution_caldav_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am_liborg_gnome_evolution_caldav_la_OBJECTS = caldav-source.lo --liborg_gnome_evolution_caldav_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_caldav_la_OBJECTS) --liborg_gnome_evolution_caldav_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_caldav_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - $(EVOLUTION_CALENDAR_CFLAGS) \ -@@ -399,85 +393,97 @@ - -I$(top_srcdir) \ - -DCALDAV_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = org-gnome-evolution-caldav.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la -+ - liborg_gnome_evolution_caldav_la_SOURCES = \ - caldav-source.c - -+ - liborg_gnome_evolution_caldav_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) - -+ - liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - EXTRA_DIST = \ - org-gnome-evolution-caldav.eplug.xml - -+ - CLEANFILES = org-gnome-evolution-caldav.eplug -+subdir = plugins/caldav -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_caldav_la_DEPENDENCIES = -+am_liborg_gnome_evolution_caldav_la_OBJECTS = caldav-source.lo -+liborg_gnome_evolution_caldav_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_caldav_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/caldav-source.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_caldav_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/caldav/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/caldav/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-caldav.la: $(liborg_gnome_evolution_caldav_la_OBJECTS) $(liborg_gnome_evolution_caldav_la_DEPENDENCIES) -- $(liborg_gnome_evolution_caldav_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_caldav_la_OBJECTS) $(liborg_gnome_evolution_caldav_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_caldav_la_LDFLAGS) $(liborg_gnome_evolution_caldav_la_OBJECTS) $(liborg_gnome_evolution_caldav_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -485,49 +491,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caldav-source.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -536,7 +567,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -548,11 +578,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -575,23 +604,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -605,10 +639,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -629,7 +662,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -643,34 +676,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -691,23 +714,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/calendar-file/Makefile.in evolution-2.12.2/plugins/calendar-file/Makefile.in ---- evolution-2.12.2.orig/plugins/calendar-file/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/calendar-file/Makefile.in 2007-12-05 15:54:57.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/calendar-file --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_calendar_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am_liborg_gnome_calendar_file_la_OBJECTS = calendar-file.lo --liborg_gnome_calendar_file_la_OBJECTS = \ -- $(am_liborg_gnome_calendar_file_la_OBJECTS) --liborg_gnome_calendar_file_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_calendar_file_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,93 +384,100 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) - -+ - plugin_DATA = org-gnome-calendar-file.eplug - plugin_LTLIBRARIES = liborg-gnome-calendar-file.la -+ - liborg_gnome_calendar_file_la_SOURCES = calendar-file.c - liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_calendar_file_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - EXTRA_DIST = org-gnome-calendar-file.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/calendar-file -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_calendar_file_la_DEPENDENCIES = -+am_liborg_gnome_calendar_file_la_OBJECTS = calendar-file.lo -+liborg_gnome_calendar_file_la_OBJECTS = \ -+ $(am_liborg_gnome_calendar_file_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-file.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_calendar_file_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/calendar-file/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/calendar-file/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-calendar-file.la: $(liborg_gnome_calendar_file_la_OBJECTS) $(liborg_gnome_calendar_file_la_DEPENDENCIES) -- $(liborg_gnome_calendar_file_la_LINK) -rpath $(plugindir) $(liborg_gnome_calendar_file_la_OBJECTS) $(liborg_gnome_calendar_file_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_calendar_file_la_LDFLAGS) $(liborg_gnome_calendar_file_la_OBJECTS) $(liborg_gnome_calendar_file_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -481,49 +485,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-file.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -532,7 +561,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -544,11 +572,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -571,23 +598,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -602,10 +634,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -627,7 +658,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -642,34 +673,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -690,23 +711,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/calendar-http/Makefile.in evolution-2.12.2/plugins/calendar-http/Makefile.in ---- evolution-2.12.2.orig/plugins/calendar-http/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/calendar-http/Makefile.in 2007-12-05 15:54:57.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/calendar-http --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_calendar_http_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am_liborg_gnome_calendar_http_la_OBJECTS = calendar-http.lo --liborg_gnome_calendar_http_la_OBJECTS = \ -- $(am_liborg_gnome_calendar_http_la_OBJECTS) --liborg_gnome_calendar_http_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_calendar_http_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,93 +384,100 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) - -+ - plugin_DATA = org-gnome-calendar-http.eplug - plugin_LTLIBRARIES = liborg-gnome-calendar-http.la -+ - liborg_gnome_calendar_http_la_SOURCES = calendar-http.c - liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_calendar_http_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - EXTRA_DIST = org-gnome-calendar-http.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/calendar-http -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_calendar_http_la_DEPENDENCIES = -+am_liborg_gnome_calendar_http_la_OBJECTS = calendar-http.lo -+liborg_gnome_calendar_http_la_OBJECTS = \ -+ $(am_liborg_gnome_calendar_http_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-http.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_calendar_http_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/calendar-http/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/calendar-http/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-calendar-http.la: $(liborg_gnome_calendar_http_la_OBJECTS) $(liborg_gnome_calendar_http_la_DEPENDENCIES) -- $(liborg_gnome_calendar_http_la_LINK) -rpath $(plugindir) $(liborg_gnome_calendar_http_la_OBJECTS) $(liborg_gnome_calendar_http_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_calendar_http_la_LDFLAGS) $(liborg_gnome_calendar_http_la_OBJECTS) $(liborg_gnome_calendar_http_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -481,49 +485,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-http.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -532,7 +561,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -544,11 +572,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -571,23 +598,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -602,10 +634,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -627,7 +658,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -642,34 +673,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -690,23 +711,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/calendar-weather/Makefile.in evolution-2.12.2/plugins/calendar-weather/Makefile.in ---- evolution-2.12.2.orig/plugins/calendar-weather/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/calendar-weather/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,63 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/calendar-weather --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ -- "$(DESTDIR)$(weatherdatadir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_calendar_weather_la_DEPENDENCIES = \ -- $(top_builddir)/calendar/gui/libevolution-calendar.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_calendar_weather_la_OBJECTS = calendar-weather.lo --liborg_gnome_calendar_weather_la_OBJECTS = \ -- $(am_liborg_gnome_calendar_weather_la_OBJECTS) --liborg_gnome_calendar_weather_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_calendar_weather_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --weatherdataDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) $(weatherdata_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -121,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -132,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -157,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -182,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -190,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -248,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -272,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -296,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -304,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -311,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -320,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -342,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -372,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -391,14 +384,12 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` - weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ -@@ -407,6 +398,7 @@ - -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ - -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" - -+ - weatherdata_DATA = \ - category_weather_cloudy_16.png \ - category_weather_fog_16.png \ -@@ -416,86 +408,97 @@ - category_weather_sun_16.png \ - category_weather_tstorm_16.png - -+ - plugin_DATA = org-gnome-calendar-weather.eplug - plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la -+ - liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c - liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_calendar_weather_la_LIBADD = \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - EXTRA_DIST = \ - org-gnome-calendar-weather.eplug.xml \ - $(weatherdata_DATA) - -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/calendar-weather -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_calendar_weather_la_DEPENDENCIES = \ -+ $(top_builddir)/calendar/gui/libevolution-calendar.la -+am_liborg_gnome_calendar_weather_la_OBJECTS = calendar-weather.lo -+liborg_gnome_calendar_weather_la_OBJECTS = \ -+ $(am_liborg_gnome_calendar_weather_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-weather.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) -+DATA = $(plugin_DATA) $(weatherdata_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_calendar_weather_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/calendar-weather/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/calendar-weather/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-calendar-weather.la: $(liborg_gnome_calendar_weather_la_OBJECTS) $(liborg_gnome_calendar_weather_la_DEPENDENCIES) -- $(liborg_gnome_calendar_weather_la_LINK) -rpath $(plugindir) $(liborg_gnome_calendar_weather_la_OBJECTS) $(liborg_gnome_calendar_weather_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_calendar_weather_la_LDFLAGS) $(liborg_gnome_calendar_weather_la_OBJECTS) $(liborg_gnome_calendar_weather_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -503,66 +506,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar-weather.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done -+weatherdataDATA_INSTALL = $(INSTALL_DATA) - install-weatherdataDATA: $(weatherdata_DATA) - @$(NORMAL_INSTALL) -- test -z "$(weatherdatadir)" || $(MKDIR_P) "$(DESTDIR)$(weatherdatadir)" -+ $(mkinstalldirs) $(DESTDIR)$(weatherdatadir) - @list='$(weatherdata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(weatherdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(weatherdatadir)/$$f'"; \ -- $(weatherdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(weatherdatadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(weatherdataDATA_INSTALL) $$d$$p $(DESTDIR)$(weatherdatadir)/$$f"; \ -+ $(weatherdataDATA_INSTALL) $$d$$p $(DESTDIR)$(weatherdatadir)/$$f; \ - done - - uninstall-weatherdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(weatherdata_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(weatherdatadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(weatherdatadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(weatherdatadir)/$$f"; \ -+ rm -f $(DESTDIR)$(weatherdatadir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -571,7 +600,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -583,11 +611,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -610,23 +637,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -641,10 +673,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(weatherdatadir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) $(DESTDIR)$(weatherdatadir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -666,7 +697,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -681,14 +712,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -696,20 +725,12 @@ - install-data-am: install-pluginDATA install-pluginLTLIBRARIES \ - install-weatherdataDATA - --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 -@@ -730,25 +751,21 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ -- uninstall-weatherdataDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES uninstall-weatherdataDATA - - .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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- install-strip install-weatherdataDATA 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA install-pluginLTLIBRARIES install-strip \ -+ install-weatherdataDATA 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-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-weatherdataDATA - - -diff -ruN evolution-2.12.2.orig/plugins/copy-tool/Makefile.in evolution-2.12.2/plugins/copy-tool/Makefile.in ---- evolution-2.12.2.orig/plugins/copy-tool/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/copy-tool/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/copy-tool --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_copy_tool_la_LIBADD = --am_liborg_gnome_copy_tool_la_OBJECTS = copy-tool.lo --liborg_gnome_copy_tool_la_OBJECTS = \ -- $(am_liborg_gnome_copy_tool_la_OBJECTS) --liborg_gnome_copy_tool_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_copy_tool_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,89 +384,96 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-copy-tool.eplug - plugin_LTLIBRARIES = liborg-gnome-copy-tool.la -+ - liborg_gnome_copy_tool_la_SOURCES = copy-tool.c - liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-copy-tool.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/copy-tool -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_copy_tool_la_LIBADD = -+am_liborg_gnome_copy_tool_la_OBJECTS = copy-tool.lo -+liborg_gnome_copy_tool_la_OBJECTS = \ -+ $(am_liborg_gnome_copy_tool_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/copy-tool.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_copy_tool_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/copy-tool/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/copy-tool/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-copy-tool.la: $(liborg_gnome_copy_tool_la_OBJECTS) $(liborg_gnome_copy_tool_la_DEPENDENCIES) -- $(liborg_gnome_copy_tool_la_LINK) -rpath $(plugindir) $(liborg_gnome_copy_tool_la_OBJECTS) $(liborg_gnome_copy_tool_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_copy_tool_la_LDFLAGS) $(liborg_gnome_copy_tool_la_OBJECTS) $(liborg_gnome_copy_tool_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -476,49 +481,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy-tool.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -527,7 +557,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,11 +568,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,23 +594,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +630,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -622,7 +654,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +669,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -685,23 +707,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/default-mailer/Makefile.in evolution-2.12.2/plugins/default-mailer/Makefile.in ---- evolution-2.12.2.orig/plugins/default-mailer/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/default-mailer/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,61 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/default-mailer --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_default_mailer_la_LIBADD = --am_liborg_gnome_default_mailer_la_OBJECTS = default-mailer.lo --liborg_gnome_default_mailer_la_OBJECTS = \ -- $(am_liborg_gnome_default_mailer_la_OBJECTS) --liborg_gnome_default_mailer_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_default_mailer_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -119,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -130,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -155,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -180,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -188,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -246,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -270,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -294,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -302,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -309,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -318,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -340,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -370,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -389,102 +384,113 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - error_DATA = org-gnome-default-mailer.error - errordir = $(privdatadir)/errors -+ - plugin_DATA = org-gnome-default-mailer.eplug - plugin_LTLIBRARIES = liborg-gnome-default-mailer.la -+ - liborg_gnome_default_mailer_la_SOURCES = default-mailer.c - liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version -+ - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - EXTRA_DIST = \ - org-gnome-default-mailer.eplug.xml \ - org-gnome-default-mailer.error.xml \ - $(schema_in_files) - -+ - BUILT_SOURCES = org-gnome-default-mailer.eplug \ - org-gnome-default-mailer.error - -+ - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+subdir = plugins/default-mailer -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_default_mailer_la_LIBADD = -+am_liborg_gnome_default_mailer_la_OBJECTS = default-mailer.lo -+liborg_gnome_default_mailer_la_OBJECTS = \ -+ $(am_liborg_gnome_default_mailer_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/default-mailer.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) -+DATA = $(error_DATA) $(plugin_DATA) $(schema_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_default_mailer_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/default-mailer/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/default-mailer/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-default-mailer.la: $(liborg_gnome_default_mailer_la_OBJECTS) $(liborg_gnome_default_mailer_la_DEPENDENCIES) -- $(liborg_gnome_default_mailer_la_LINK) -rpath $(plugindir) $(liborg_gnome_default_mailer_la_OBJECTS) $(liborg_gnome_default_mailer_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_default_mailer_la_LDFLAGS) $(liborg_gnome_default_mailer_la_OBJECTS) $(liborg_gnome_default_mailer_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -492,83 +498,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default-mailer.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -577,7 +610,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -589,11 +621,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -616,23 +647,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -647,10 +683,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -672,7 +707,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -688,36 +723,25 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - --install-data-am: install-data-local install-errorDATA \ -- install-pluginDATA install-pluginLTLIBRARIES \ -- install-schemaDATA -- --install-dvi: install-dvi-am -+install-data-am: install-data-local install-errorDATA install-pluginDATA \ -+ install-pluginLTLIBRARIES install-schemaDATA - - 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 -@@ -738,26 +762,22 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA - --.MAKE: install-am install-strip -- - .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-data-local install-dvi install-dvi-am \ -- install-errorDATA 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-ps install-ps-am \ -- install-schemaDATA 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-errorDATA uninstall-pluginDATA \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-data-local \ -+ install-errorDATA install-exec install-exec-am install-info \ -+ install-info-am install-man install-pluginDATA \ -+ install-pluginLTLIBRARIES install-schemaDATA 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-errorDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA - - -diff -ruN evolution-2.12.2.orig/plugins/default-source/Makefile.in evolution-2.12.2/plugins/default-source/Makefile.in ---- evolution-2.12.2.orig/plugins/default-source/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/default-source/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/default-source --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_default_source_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_default_source_la_OBJECTS = default-source.lo --liborg_gnome_default_source_la_OBJECTS = \ -- $(am_liborg_gnome_default_source_la_OBJECTS) --liborg_gnome_default_source_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_default_source_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_default_source_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_default_source_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -400,83 +393,93 @@ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) - -+ - plugin_DATA = org-gnome-default-source.eplug - plugin_LTLIBRARIES = liborg-gnome-default-source.la -+ - liborg_gnome_default_source_la_SOURCES = default-source.c - liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_default_source_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -+ - EXTRA_DIST = org-gnome-default-source.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/default-source -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_default_source_la_DEPENDENCIES = -+am_liborg_gnome_default_source_la_OBJECTS = default-source.lo -+liborg_gnome_default_source_la_OBJECTS = \ -+ $(am_liborg_gnome_default_source_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/default-source.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_default_source_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_default_source_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/default-source/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/default-source/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-default-source.la: $(liborg_gnome_default_source_la_OBJECTS) $(liborg_gnome_default_source_la_DEPENDENCIES) -- $(liborg_gnome_default_source_la_LINK) -rpath $(plugindir) $(liborg_gnome_default_source_la_OBJECTS) $(liborg_gnome_default_source_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_default_source_la_LDFLAGS) $(liborg_gnome_default_source_la_OBJECTS) $(liborg_gnome_default_source_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -484,49 +487,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default-source.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -535,7 +563,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -547,11 +574,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -574,23 +600,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -605,10 +636,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -630,7 +660,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -645,34 +675,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -693,23 +713,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/exchange-operations/Makefile.in evolution-2.12.2/plugins/exchange-operations/Makefile.in ---- evolution-2.12.2.orig/plugins/exchange-operations/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/exchange-operations/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,77 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/exchange-operations --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_exchange_operations_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/calendar/gui/libevolution-calendar.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_exchange_operations_la_OBJECTS = \ -- exchange-operations.lo exchange-config-listener.lo \ -- exchange-calendar.lo exchange-contacts.lo \ -- exchange-change-password.lo exchange-delegates-user.lo \ -- exchange-delegates.lo exchange-user-dialog.lo \ -- exchange-folder-size-display.lo exchange-account-setup.lo \ -- exchange-permissions-dialog.lo exchange-folder-permission.lo \ -- exchange-folder-subscription.lo exchange-folder.lo \ -- exchange-mail-send-options.lo exchange-send-options.lo --liborg_gnome_exchange_operations_la_OBJECTS = \ -- $(am_liborg_gnome_exchange_operations_la_OBJECTS) --liborg_gnome_exchange_operations_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_exchange_operations_la_LDFLAGS) $(LDFLAGS) -o \ -- $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -135,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -146,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -171,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -196,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -204,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -262,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -286,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -310,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -318,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -325,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -334,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -356,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -386,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -405,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = -I . \ - -I$(top_srcdir) \ -@@ -421,6 +397,7 @@ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = org-gnome-exchange-operations.eplug \ - org-gnome-folder-permissions.xml \ - org-gnome-folder-subscription.xml \ -@@ -428,7 +405,9 @@ - org-gnome-exchange-cal-subscription.xml \ - org-gnome-exchange-ab-subscription.xml - -+ - plugin_LTLIBRARIES = liborg-gnome-exchange-operations.la -+ - liborg_gnome_exchange_operations_la_SOURCES = \ - exchange-operations.c \ - exchange-operations.h \ -@@ -457,6 +436,7 @@ - exchange-send-options.c \ - exchange-send-options.h - -+ - liborg_gnome_exchange_operations_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ -@@ -465,7 +445,9 @@ - $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ - $(CAMEL_EXCHANGE_LIBS) - -+ - liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - glade_DATA = \ - exchange-change-password.glade \ - exchange-delegates.glade \ -@@ -476,8 +458,10 @@ - exchange-oof.glade \ - exchange-send-options.glade - -+ - error_DATA = org-gnome-exchange-operations.error - errordir = $(privdatadir)/errors -+ - EXTRA_DIST = \ - org-gnome-exchange-operations.eplug.xml \ - org-gnome-exchange-operations.error.xml \ -@@ -488,74 +472,110 @@ - org-gnome-exchange-ab-subscription.xml \ - $(glade_DATA) - -+ - BUILT_SOURCES = $(error_DATA) org-gnome-exchange-operations.eplug -+ - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/exchange-operations -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_exchange_operations_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/calendar/gui/libevolution-calendar.la \ -+ $(top_builddir)/mail/libevolution-mail.la \ -+ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la -+am_liborg_gnome_exchange_operations_la_OBJECTS = exchange-operations.lo \ -+ exchange-config-listener.lo exchange-calendar.lo \ -+ exchange-contacts.lo exchange-change-password.lo \ -+ exchange-delegates-user.lo exchange-delegates.lo \ -+ exchange-user-dialog.lo exchange-folder-size-display.lo \ -+ exchange-account-setup.lo exchange-permissions-dialog.lo \ -+ exchange-folder-permission.lo exchange-folder-subscription.lo \ -+ exchange-folder.lo exchange-mail-send-options.lo \ -+ exchange-send-options.lo -+liborg_gnome_exchange_operations_la_OBJECTS = \ -+ $(am_liborg_gnome_exchange_operations_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/exchange-account-setup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-change-password.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-config-listener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-contacts.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-delegates-user.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-delegates.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder-permission.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder-size-display.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder-subscription.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-folder.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-mail-send-options.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-operations.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-permissions-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-send-options.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/exchange-user-dialog.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) -+DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_exchange_operations_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/exchange-operations/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/exchange-operations/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-exchange-operations.la: $(liborg_gnome_exchange_operations_la_OBJECTS) $(liborg_gnome_exchange_operations_la_DEPENDENCIES) -- $(liborg_gnome_exchange_operations_la_LINK) -rpath $(plugindir) $(liborg_gnome_exchange_operations_la_OBJECTS) $(liborg_gnome_exchange_operations_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_exchange_operations_la_LDFLAGS) $(liborg_gnome_exchange_operations_la_OBJECTS) $(liborg_gnome_exchange_operations_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -578,83 +598,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exchange-user-dialog.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -663,7 +710,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -675,11 +721,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -702,23 +747,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -733,10 +783,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -758,7 +807,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -773,35 +822,25 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - --install-data-am: install-errorDATA install-gladeDATA \ -- install-pluginDATA install-pluginLTLIBRARIES -- --install-dvi: install-dvi-am -+install-data-am: install-errorDATA install-gladeDATA install-pluginDATA \ -+ install-pluginLTLIBRARIES - - 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 -@@ -822,26 +861,23 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-gladeDATA \ -+uninstall-am: uninstall-errorDATA uninstall-gladeDATA uninstall-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-errorDATA install-exec install-exec-am \ -- install-gladeDATA install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-pluginDATA install-pluginLTLIBRARIES install-ps \ -- install-ps-am 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-errorDATA uninstall-gladeDATA \ -- uninstall-pluginDATA uninstall-pluginLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-gladeDATA install-info \ -+ install-info-am install-man install-pluginDATA \ -+ 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-errorDATA \ -+ uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES - - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/plugins/face/Makefile.in evolution-2.12.2/plugins/face/Makefile.in ---- evolution-2.12.2.orig/plugins/face/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/face/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,63 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/face --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_face_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_face_la_OBJECTS = face.lo --liborg_gnome_face_la_OBJECTS = $(am_liborg_gnome_face_la_OBJECTS) --liborg_gnome_face_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_face_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_face_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_face_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -121,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -132,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -157,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -182,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -190,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -248,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -272,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -296,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -304,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -311,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -320,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -342,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -372,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -391,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = -I. \ - -I$(top_srcdir) \ -@@ -408,11 +398,14 @@ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = \ - org-gnome-face.eplug \ - org-gnome-face-ui.xml - -+ - plugin_LTLIBRARIES = liborg-gnome-face.la -+ - liborg_gnome_face_la_SOURCES = \ - face.c - -@@ -423,87 +416,100 @@ - $(EVOLUTION_MAIL_LIBS) \ - $(NO_UNDEFINED_REQUIRED_LIBS) - -+ - liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - error_DATA = \ - org-gnome-face.errors.xml - -+ - errordir = $(privdatadir)/errors -+ - EXTRA_DIST = \ - org-gnome-face.eplug.xml \ - org-gnome-face-ui.xml \ - $(error_DATA) - -+ - BUILT_SOURCES = \ - org-gnome-face.eplug \ - $(error_i18n) - -+ - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/face -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_face_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_liborg_gnome_face_la_OBJECTS = face.lo -+liborg_gnome_face_la_OBJECTS = $(am_liborg_gnome_face_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/face.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_face_la_SOURCES) -+DATA = $(error_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_face_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/face/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/face/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-face.la: $(liborg_gnome_face_la_OBJECTS) $(liborg_gnome_face_la_DEPENDENCIES) -- $(liborg_gnome_face_la_LINK) -rpath $(plugindir) $(liborg_gnome_face_la_OBJECTS) $(liborg_gnome_face_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_face_la_LDFLAGS) $(liborg_gnome_face_la_OBJECTS) $(liborg_gnome_face_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -511,66 +517,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/face.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -579,7 +611,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -591,11 +622,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -618,23 +648,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -649,10 +684,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -674,7 +708,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -689,14 +723,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -704,20 +736,12 @@ - install-data-am: install-errorDATA install-pluginDATA \ - 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 -@@ -738,25 +762,21 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-errorDATA 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-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pluginDATA 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-errorDATA uninstall-pluginDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/folder-unsubscribe/Makefile.in evolution-2.12.2/plugins/folder-unsubscribe/Makefile.in ---- evolution-2.12.2.orig/plugins/folder-unsubscribe/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/plugins/folder-unsubscribe/Makefile.in 2007-12-05 15:54:58.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/folder-unsubscribe --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_mail_folder_unsubscribe_la_LIBADD = --am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ -- folder-unsubscribe.lo --liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ -- $(am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) --liborg_gnome_mail_folder_unsubscribe_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS) $(LDFLAGS) \ -- -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,86 +384,93 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-mail-folder-unsubscribe.eplug - plugin_LTLIBRARIES = liborg-gnome-mail-folder-unsubscribe.la -+ - liborg_gnome_mail_folder_unsubscribe_la_SOURCES = folder-unsubscribe.c - liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml -+subdir = plugins/folder-unsubscribe -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mail_folder_unsubscribe_la_LIBADD = -+am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ -+ folder-unsubscribe.lo -+liborg_gnome_mail_folder_unsubscribe_la_OBJECTS = \ -+ $(am_liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/folder-unsubscribe.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mail_folder_unsubscribe_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/folder-unsubscribe/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/folder-unsubscribe/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mail-folder-unsubscribe.la: $(liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) $(liborg_gnome_mail_folder_unsubscribe_la_DEPENDENCIES) -- $(liborg_gnome_mail_folder_unsubscribe_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) $(liborg_gnome_mail_folder_unsubscribe_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS) $(liborg_gnome_mail_folder_unsubscribe_la_OBJECTS) $(liborg_gnome_mail_folder_unsubscribe_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -475,49 +478,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/folder-unsubscribe.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -526,7 +554,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -538,11 +565,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -565,23 +591,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -595,10 +626,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -618,7 +648,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -632,34 +662,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -680,23 +700,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/groupwise-account-setup/Makefile.in evolution-2.12.2/plugins/groupwise-account-setup/Makefile.in ---- evolution-2.12.2.orig/plugins/groupwise-account-setup/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/groupwise-account-setup/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,64 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/groupwise-account-setup --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_gw_account_setup_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_liborg_gnome_gw_account_setup_la_OBJECTS = camel-gw-listener.lo \ -- groupwise-account-setup.lo --liborg_gnome_gw_account_setup_la_OBJECTS = \ -- $(am_liborg_gnome_gw_account_setup_la_OBJECTS) --liborg_gnome_gw_account_setup_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_gw_account_setup_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -122,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -133,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -158,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -183,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -191,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -249,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -273,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -297,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -305,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -312,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -321,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -343,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -373,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -392,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -406,14 +395,18 @@ - $(CAMEL_GROUPWISE_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = org-gnome-gw-account-setup.eplug - plugin_LTLIBRARIES = liborg-gnome-gw-account-setup.la -+ - liborg_gnome_gw_account_setup_la_SOURCES = \ - camel-gw-listener.c \ - camel-gw-listener.h \ - groupwise-account-setup.c - -+ - liborg_gnome_gw_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - liborg_gnome_gw_account_setup_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ -@@ -422,75 +415,88 @@ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_GROUPWISE_LIBS) - -+ - EXTRA_DIST = org-gnome-gw-account-setup.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/groupwise-account-setup -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_gw_account_setup_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/filter/libfilter.la -+am_liborg_gnome_gw_account_setup_la_OBJECTS = camel-gw-listener.lo \ -+ groupwise-account-setup.lo -+liborg_gnome_gw_account_setup_la_OBJECTS = \ -+ $(am_liborg_gnome_gw_account_setup_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/camel-gw-listener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/groupwise-account-setup.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_gw_account_setup_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/groupwise-account-setup/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/groupwise-account-setup/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-gw-account-setup.la: $(liborg_gnome_gw_account_setup_la_OBJECTS) $(liborg_gnome_gw_account_setup_la_DEPENDENCIES) -- $(liborg_gnome_gw_account_setup_la_LINK) -rpath $(plugindir) $(liborg_gnome_gw_account_setup_la_OBJECTS) $(liborg_gnome_gw_account_setup_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_gw_account_setup_la_LDFLAGS) $(liborg_gnome_gw_account_setup_la_OBJECTS) $(liborg_gnome_gw_account_setup_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -499,49 +505,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupwise-account-setup.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -550,7 +581,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -562,11 +592,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -589,23 +618,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -620,10 +654,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -645,7 +678,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -660,34 +693,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -708,23 +731,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/groupwise-features/Makefile.in evolution-2.12.2/plugins/groupwise-features/Makefile.in ---- evolution-2.12.2.orig/plugins/groupwise-features/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/groupwise-features/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,73 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/groupwise-features --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_groupwise_features_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/calendar/gui/libevolution-calendar.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/filter/libfilter.la \ -- $(NO_UNDEFINED_REQUIRED_LIBS) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_liborg_gnome_groupwise_features_la_OBJECTS = \ -- share-folder-common.lo share-folder.lo install-shared.lo \ -- send-options.lo mail-send-options.lo status-track.lo \ -- addressbook-groupwise.lo junk-mail-settings.lo \ -- junk-settings.lo proxy.lo proxy-login.lo process-meeting.lo \ -- mail-retract.lo --liborg_gnome_groupwise_features_la_OBJECTS = \ -- $(am_liborg_gnome_groupwise_features_la_OBJECTS) --liborg_gnome_groupwise_features_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_groupwise_features_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -131,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -142,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -167,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -192,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -200,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -282,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -306,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -314,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -321,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -330,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -352,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -382,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -401,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -@@ -422,8 +403,10 @@ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" - -+ - plugin_DATA = org-gnome-groupwise-features.eplug org-gnome-compose-send-options.xml - plugin_LTLIBRARIES = liborg-gnome-groupwise-features.la -+ - liborg_gnome_groupwise_features_la_SOURCES = \ - share-folder-common.c \ - share-folder.c \ -@@ -444,6 +427,7 @@ - process-meeting.c \ - mail-retract.c - -+ - liborg_gnome_groupwise_features_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ -@@ -454,7 +438,9 @@ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_GROUPWISE_LIBS) - -+ - liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - glade_DATA = \ - properties.glade \ - junk-settings.glade \ -@@ -462,14 +448,18 @@ - proxy-listing.glade \ - proxy-login-dialog.glade - -+ - error_DATA = \ - org-gnome-shared-folder.errors.xml \ - org-gnome-proxy-errors.xml \ - org-gnome-proxy-login-errors.xml \ - org-gnome-mail-retract-errors.xml - -+ - errordir = $(privdatadir)/errors -+ - BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_i18n) -+ - EXTRA_DIST = \ - $(error_DATA) \ - $(glade_DATA) \ -@@ -478,73 +468,105 @@ - org-gnome-proxy-login-errors.xml \ - org-gnome-mail-retract-errors.xml - -+ - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/groupwise-features -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@liborg_gnome_groupwise_features_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/calendar/gui/libevolution-calendar.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/filter/libfilter.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/mail/libevolution-mail.la -+@OS_WIN32_FALSE@liborg_gnome_groupwise_features_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/calendar/gui/libevolution-calendar.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/filter/libfilter.la -+am_liborg_gnome_groupwise_features_la_OBJECTS = share-folder-common.lo \ -+ share-folder.lo install-shared.lo send-options.lo \ -+ mail-send-options.lo status-track.lo addressbook-groupwise.lo \ -+ junk-mail-settings.lo junk-settings.lo proxy.lo proxy-login.lo \ -+ process-meeting.lo mail-retract.lo -+liborg_gnome_groupwise_features_la_OBJECTS = \ -+ $(am_liborg_gnome_groupwise_features_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addressbook-groupwise.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/install-shared.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/junk-mail-settings.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/junk-settings.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-retract.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-send-options.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/process-meeting.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/proxy-login.Plo ./$(DEPDIR)/proxy.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/send-options.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/share-folder-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/share-folder.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/status-track.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) -+DATA = $(error_DATA) $(glade_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_groupwise_features_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/groupwise-features/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/groupwise-features/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-groupwise-features.la: $(liborg_gnome_groupwise_features_la_OBJECTS) $(liborg_gnome_groupwise_features_la_DEPENDENCIES) -- $(liborg_gnome_groupwise_features_la_LINK) -rpath $(plugindir) $(liborg_gnome_groupwise_features_la_OBJECTS) $(liborg_gnome_groupwise_features_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_groupwise_features_la_LDFLAGS) $(liborg_gnome_groupwise_features_la_OBJECTS) $(liborg_gnome_groupwise_features_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -564,83 +586,110 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/status-track.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -649,7 +698,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -661,11 +709,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -688,23 +735,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -719,10 +771,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -744,7 +795,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -759,35 +810,25 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - --install-data-am: install-errorDATA install-gladeDATA \ -- install-pluginDATA install-pluginLTLIBRARIES -- --install-dvi: install-dvi-am -+install-data-am: install-errorDATA install-gladeDATA install-pluginDATA \ -+ install-pluginLTLIBRARIES - - 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 -@@ -808,26 +849,23 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-gladeDATA \ -+uninstall-am: uninstall-errorDATA uninstall-gladeDATA uninstall-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-errorDATA install-exec install-exec-am \ -- install-gladeDATA install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-pluginDATA install-pluginLTLIBRARIES install-ps \ -- install-ps-am 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-errorDATA uninstall-gladeDATA \ -- uninstall-pluginDATA uninstall-pluginLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-gladeDATA install-info \ -+ install-info-am install-man install-pluginDATA \ -+ 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-errorDATA \ -+ uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES - - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/plugins/hula-account-setup/Makefile.in evolution-2.12.2/plugins/hula-account-setup/Makefile.in ---- evolution-2.12.2.orig/plugins/hula-account-setup/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/hula-account-setup/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,66 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/hula-account-setup --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_evolution_hula_account_setup_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ -- camel-hula-listener.lo hula-account-setup.lo --liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS) --liborg_gnome_evolution_hula_account_setup_la_LINK = $(LIBTOOL) \ -- --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ -- $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_hula_account_setup_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) --DIST_SOURCES = \ -- $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -124,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -135,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -160,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -185,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -193,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -251,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -275,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -299,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -307,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -314,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -323,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -345,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -375,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -394,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -406,14 +393,18 @@ - $(EVOLUTION_CALENDAR_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = org-gnome-evolution-hula-account-setup.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la -+ - liborg_gnome_evolution_hula_account_setup_la_SOURCES = \ - camel-hula-listener.c \ - camel-hula-listener.h \ - hula-account-setup.c - -+ - liborg_gnome_evolution_hula_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - liborg_gnome_evolution_hula_account_setup_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ -@@ -421,75 +412,88 @@ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) - -+ - EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/hula-account-setup -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_hula_account_setup_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/filter/libfilter.la -+am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ -+ camel-hula-listener.lo hula-account-setup.lo -+liborg_gnome_evolution_hula_account_setup_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_hula_account_setup_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/camel-hula-listener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/hula-account-setup.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_hula_account_setup_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/hula-account-setup/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/hula-account-setup/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-hula-account-setup.la: $(liborg_gnome_evolution_hula_account_setup_la_OBJECTS) $(liborg_gnome_evolution_hula_account_setup_la_DEPENDENCIES) -- $(liborg_gnome_evolution_hula_account_setup_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_hula_account_setup_la_OBJECTS) $(liborg_gnome_evolution_hula_account_setup_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_hula_account_setup_la_LDFLAGS) $(liborg_gnome_evolution_hula_account_setup_la_OBJECTS) $(liborg_gnome_evolution_hula_account_setup_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -498,49 +502,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hula-account-setup.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -549,7 +578,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -561,11 +589,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -588,23 +615,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -619,10 +651,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -644,7 +675,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -659,34 +690,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -707,23 +728,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/imap-features/Makefile.in evolution-2.12.2/plugins/imap-features/Makefile.in ---- evolution-2.12.2.orig/plugins/imap-features/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/imap-features/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/imap-features --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" \ -- "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_imap_features_la_DEPENDENCIES = \ -- $(NO_UNDEFINED_REQUIRED_LIBS) $(am__DEPENDENCIES_1) --am_liborg_gnome_imap_features_la_OBJECTS = imap-headers.lo --liborg_gnome_imap_features_la_OBJECTS = \ -- $(am_liborg_gnome_imap_features_la_OBJECTS) --liborg_gnome_imap_features_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_imap_features_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_imap_features_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_imap_features_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/mail \ -@@ -406,92 +398,109 @@ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" - -+ - plugin_DATA = org-gnome-imap-features.eplug - plugin_LTLIBRARIES = liborg-gnome-imap-features.la -+ - liborg_gnome_imap_features_la_SOURCES = \ - imap-headers.c - -+ - liborg_gnome_imap_features_la_LIBADD = \ - $(NO_UNDEFINED_REQUIRED_LIBS) \ - $(EVOLUTION_MAIL_LIBS) - -+ - liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - glade_DATA = \ - imap-headers.glade - -+ - errordir = $(privdatadir)/errors -+ - BUILT_SOURCES = org-gnome-imap-features.eplug $(error_i18n) -+ - EXTRA_DIST = \ - $(glade_DATA) \ - org-gnome-imap-features.eplug.xml - -+ - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/imap-features -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@liborg_gnome_imap_features_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/mail/libevolution-mail.la -+@OS_WIN32_FALSE@liborg_gnome_imap_features_la_DEPENDENCIES = -+am_liborg_gnome_imap_features_la_OBJECTS = imap-headers.lo -+liborg_gnome_imap_features_la_OBJECTS = \ -+ $(am_liborg_gnome_imap_features_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/imap-headers.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_imap_features_la_SOURCES) -+DATA = $(glade_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_imap_features_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/imap-features/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/imap-features/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-imap-features.la: $(liborg_gnome_imap_features_la_OBJECTS) $(liborg_gnome_imap_features_la_DEPENDENCIES) -- $(liborg_gnome_imap_features_la_LINK) -rpath $(plugindir) $(liborg_gnome_imap_features_la_OBJECTS) $(liborg_gnome_imap_features_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_imap_features_la_LDFLAGS) $(liborg_gnome_imap_features_la_OBJECTS) $(liborg_gnome_imap_features_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -499,66 +508,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap-headers.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -567,7 +602,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -579,11 +613,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -606,23 +639,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -637,10 +675,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -662,7 +699,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -677,14 +714,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -692,20 +727,12 @@ - install-data-am: install-gladeDATA install-pluginDATA \ - 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 -@@ -726,25 +753,21 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-man install-pluginDATA 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-gladeDATA uninstall-pluginDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-gladeDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/import-ics-attachments/Makefile.in evolution-2.12.2/plugins/import-ics-attachments/Makefile.in ---- evolution-2.12.2.orig/plugins/import-ics-attachments/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/import-ics-attachments/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,63 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/import-ics-attachments --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \ -- icsimporter.lo --liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = $(am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) --liborg_gnome_evolution_mail_attachments_import_ics_la_LINK = \ -- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -121,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -132,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -157,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -182,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -190,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -248,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -272,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -296,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -304,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -311,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -320,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -342,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -372,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -391,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)\ -@@ -413,8 +403,10 @@ - -DPLUGINDIR=\""$(plugindir)"\" \ - -DPREFIX=\""$(prefix)"\" - -+ - plugin_DATA = org-gnome-evolution-mail-attachments-import-ics.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-mail-attachments-import-ics.la -+ - liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES = icsimporter.c - liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ -@@ -422,75 +414,87 @@ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) - -+ - EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/import-ics-attachments -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \ -+ icsimporter.lo -+liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/icsimporter.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = \ -+ $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/import-ics-attachments/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/import-ics-attachments/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-mail-attachments-import-ics.la: $(liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES) -- $(liborg_gnome_evolution_mail_attachments_import_ics_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS) $(liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -498,49 +502,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icsimporter.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -549,7 +578,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -561,11 +589,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -588,23 +615,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -619,10 +651,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -644,7 +675,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -659,34 +690,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -707,23 +728,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/ipod-sync/Makefile.in evolution-2.12.2/plugins/ipod-sync/Makefile.in ---- evolution-2.12.2.orig/plugins/ipod-sync/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/ipod-sync/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/ipod-sync --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_ipod_sync_evolution_la_DEPENDENCIES = \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_ipod_sync_evolution_la_OBJECTS = ipod-sync.lo \ -- ical-format.lo evolution-ipod-sync.lo ipod.lo --liborg_gnome_ipod_sync_evolution_la_OBJECTS = \ -- $(am_liborg_gnome_ipod_sync_evolution_la_OBJECTS) --liborg_gnome_ipod_sync_evolution_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_ipod_sync_evolution_la_LDFLAGS) $(LDFLAGS) -o \ -- $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,19 +384,18 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - -DDBUS_API_SUBJECT_TO_CHANGE - -+ - plugin_DATA = org-gnome-ipod-sync-evolution.eplug - plugin_LTLIBRARIES = liborg-gnome-ipod-sync-evolution.la -+ - liborg_gnome_ipod_sync_evolution_la_SOURCES = \ - ipod-sync.c \ - ical-format.c \ -@@ -411,79 +404,91 @@ - format-handler.h \ - evolution-ipod-sync.h - -+ - liborg_gnome_ipod_sync_evolution_la_LDFLAGS = -module -avoid-version - liborg_gnome_ipod_sync_evolution_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - EXTRA_DIST = org-gnome-ipod-sync-evolution.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/ipod-sync -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_ipod_sync_evolution_la_DEPENDENCIES = -+am_liborg_gnome_ipod_sync_evolution_la_OBJECTS = ipod-sync.lo \ -+ ical-format.lo evolution-ipod-sync.lo ipod.lo -+liborg_gnome_ipod_sync_evolution_la_OBJECTS = \ -+ $(am_liborg_gnome_ipod_sync_evolution_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/evolution-ipod-sync.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ical-format.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ipod-sync.Plo ./$(DEPDIR)/ipod.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_ipod_sync_evolution_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ipod-sync/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/ipod-sync/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-ipod-sync-evolution.la: $(liborg_gnome_ipod_sync_evolution_la_OBJECTS) $(liborg_gnome_ipod_sync_evolution_la_DEPENDENCIES) -- $(liborg_gnome_ipod_sync_evolution_la_LINK) -rpath $(plugindir) $(liborg_gnome_ipod_sync_evolution_la_OBJECTS) $(liborg_gnome_ipod_sync_evolution_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_ipod_sync_evolution_la_LDFLAGS) $(liborg_gnome_ipod_sync_evolution_la_OBJECTS) $(liborg_gnome_ipod_sync_evolution_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -494,49 +499,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipod.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -545,7 +575,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -557,11 +586,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -584,23 +612,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -615,10 +648,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -640,7 +672,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -655,34 +687,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -703,23 +725,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/itip-formatter/Makefile.in evolution-2.12.2/plugins/itip-formatter/Makefile.in ---- evolution-2.12.2.orig/plugins/itip-formatter/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/itip-formatter/Makefile.in 2007-12-05 15:54:59.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,66 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/itip-formatter --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_itip_formatter_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/calendar/gui/libevolution-calendar.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_liborg_gnome_itip_formatter_la_OBJECTS = itip-formatter.lo \ -- itip-view.lo --liborg_gnome_itip_formatter_la_OBJECTS = \ -- $(am_liborg_gnome_itip_formatter_la_OBJECTS) --liborg_gnome_itip_formatter_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_itip_formatter_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -124,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -135,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -160,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -185,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -193,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -251,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -275,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -299,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -307,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -314,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -323,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -345,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -375,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -394,19 +384,18 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - plugin_DATA = org-gnome-itip-formatter.eplug - plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la -+ - liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h - liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_itip_formatter_la_LIBADD = \ -@@ -416,80 +405,95 @@ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - error_DATA = org-gnome-itip-formatter.error - errordir = $(privdatadir)/errors -+ - BUILT_SOURCES = $(plugin_DATA) $(error_DATA) -+ - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - org-gnome-itip-formatter.eplug.xml \ - org-gnome-itip-formatter.error.xml - -+subdir = plugins/itip-formatter -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_itip_formatter_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/calendar/gui/libevolution-calendar.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_liborg_gnome_itip_formatter_la_OBJECTS = itip-formatter.lo \ -+ itip-view.lo -+liborg_gnome_itip_formatter_la_OBJECTS = \ -+ $(am_liborg_gnome_itip_formatter_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/itip-formatter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/itip-view.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) -+DATA = $(error_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_itip_formatter_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/itip-formatter/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/itip-formatter/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-itip-formatter.la: $(liborg_gnome_itip_formatter_la_OBJECTS) $(liborg_gnome_itip_formatter_la_DEPENDENCIES) -- $(liborg_gnome_itip_formatter_la_LINK) -rpath $(plugindir) $(liborg_gnome_itip_formatter_la_OBJECTS) $(liborg_gnome_itip_formatter_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_itip_formatter_la_LDFLAGS) $(liborg_gnome_itip_formatter_la_OBJECTS) $(liborg_gnome_itip_formatter_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -498,66 +502,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itip-view.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -566,7 +596,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -578,11 +607,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -605,23 +633,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -636,10 +669,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -661,7 +693,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -676,14 +708,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -691,20 +721,12 @@ - install-data-am: install-errorDATA install-pluginDATA \ - 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 -@@ -725,25 +747,21 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-errorDATA 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-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pluginDATA 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-errorDATA uninstall-pluginDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/mail-account-disable/Makefile.in evolution-2.12.2/plugins/mail-account-disable/Makefile.in ---- evolution-2.12.2.orig/plugins/mail-account-disable/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/mail-account-disable/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mail-account-disable --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --libmail_account_disable_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) --am_libmail_account_disable_la_OBJECTS = mail-account-disable.lo --libmail_account_disable_la_OBJECTS = \ -- $(am_libmail_account_disable_la_OBJECTS) --libmail_account_disable_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(libmail_account_disable_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libmail_account_disable_la_SOURCES) --DIST_SOURCES = $(libmail_account_disable_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -402,83 +393,95 @@ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = org-gnome-mail-account-disable.eplug - plugin_LTLIBRARIES = libmail-account-disable.la -+ - libmail_account_disable_la_SOURCES = mail-account-disable.c - libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - libmail_account_disable_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) - -+ - EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mail-account-disable -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+libmail_account_disable_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_libmail_account_disable_la_OBJECTS = mail-account-disable.lo -+libmail_account_disable_la_OBJECTS = \ -+ $(am_libmail_account_disable_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-account-disable.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmail_account_disable_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(libmail_account_disable_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-account-disable/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mail-account-disable/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libmail-account-disable.la: $(libmail_account_disable_la_OBJECTS) $(libmail_account_disable_la_DEPENDENCIES) -- $(libmail_account_disable_la_LINK) -rpath $(plugindir) $(libmail_account_disable_la_OBJECTS) $(libmail_account_disable_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(libmail_account_disable_la_LDFLAGS) $(libmail_account_disable_la_OBJECTS) $(libmail_account_disable_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -486,49 +489,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-account-disable.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -537,7 +565,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -549,11 +576,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -576,23 +602,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -607,10 +638,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -632,7 +662,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -647,34 +677,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -695,23 +715,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/mailing-list-actions/Makefile.in evolution-2.12.2/plugins/mailing-list-actions/Makefile.in ---- evolution-2.12.2.orig/plugins/mailing-list-actions/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/mailing-list-actions/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mailing-list-actions --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_mailing_list_actions_la_LIBADD = --am_liborg_gnome_mailing_list_actions_la_OBJECTS = \ -- mailing-list-actions.lo --liborg_gnome_mailing_list_actions_la_OBJECTS = \ -- $(am_liborg_gnome_mailing_list_actions_la_OBJECTS) --liborg_gnome_mailing_list_actions_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_mailing_list_actions_la_LDFLAGS) $(LDFLAGS) -o \ -- $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) --errorDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,99 +384,109 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/composer \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-mailing-list-actions.eplug org-gnome-mailing-list-actions.xml - plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la -+ - liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c - liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version -+ - error_DATA = org-gnome-mailing-list-actions.error - errordir = $(privdatadir)/errors -+ - BUILT_SOURCES = \ - org-gnome-mailing-list-actions.eplug \ - org-gnome-mailing-list-actions.error - -+ - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - org-gnome-mailing-list-actions.eplug.xml \ - org-gnome-mailing-list-actions.error.xml \ - org-gnome-mailing-list-actions.xml - -+subdir = plugins/mailing-list-actions -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mailing_list_actions_la_LIBADD = -+am_liborg_gnome_mailing_list_actions_la_OBJECTS = \ -+ mailing-list-actions.lo -+liborg_gnome_mailing_list_actions_la_OBJECTS = \ -+ $(am_liborg_gnome_mailing_list_actions_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mailing-list-actions.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) -+DATA = $(error_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mailing_list_actions_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mailing-list-actions/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mailing-list-actions/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mailing-list-actions.la: $(liborg_gnome_mailing_list_actions_la_OBJECTS) $(liborg_gnome_mailing_list_actions_la_DEPENDENCIES) -- $(liborg_gnome_mailing_list_actions_la_LINK) -rpath $(plugindir) $(liborg_gnome_mailing_list_actions_la_OBJECTS) $(liborg_gnome_mailing_list_actions_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mailing_list_actions_la_LDFLAGS) $(liborg_gnome_mailing_list_actions_la_OBJECTS) $(liborg_gnome_mailing_list_actions_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -490,66 +494,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailing-list-actions.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -558,7 +588,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -570,11 +599,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -597,23 +625,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -628,10 +661,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(errordir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -653,7 +685,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -668,14 +700,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -683,20 +713,12 @@ - install-data-am: install-errorDATA install-pluginDATA \ - 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 -@@ -717,25 +739,21 @@ - - ps-am: - --uninstall-am: uninstall-errorDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-errorDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-errorDATA 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-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-errorDATA \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pluginDATA 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-errorDATA uninstall-pluginDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-errorDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/mail-notification/Makefile.in evolution-2.12.2/plugins/mail-notification/Makefile.in ---- evolution-2.12.2.orig/plugins/mail-notification/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/mail-notification/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mail-notification --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ -- "$(DESTDIR)$(schemadir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_mail_notification_la_LIBADD = --am_liborg_gnome_mail_notification_la_OBJECTS = mail-notification.lo --liborg_gnome_mail_notification_la_OBJECTS = \ -- $(am_liborg_gnome_mail_notification_la_OBJECTS) --liborg_gnome_mail_notification_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_mail_notification_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) $(schema_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -402,90 +395,103 @@ - $(LIBNOTIFY_CFLAGS) \ - $(NMN_CFLAGS) - -+ - plugin_DATA = org-gnome-mail-notification.eplug - plugin_LTLIBRARIES = liborg-gnome-mail-notification.la -+ - liborg_gnome_mail_notification_la_SOURCES = mail-notification.c - liborg_gnome_mail_notification_la_LDFLAGS = \ - -module -avoid-version \ - $(LIBNOTIFY_LIBS) \ - $(NMN_LIBS) - -+ - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = apps-evolution-mail-notification.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - BUILT_SOURCES = $(plugin_DATA) -+ - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+ - EXTRA_DIST = \ - org-gnome-mail-notification.eplug.xml \ - $(schema_in_files) - -+subdir = plugins/mail-notification -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mail_notification_la_LIBADD = -+am_liborg_gnome_mail_notification_la_OBJECTS = mail-notification.lo -+liborg_gnome_mail_notification_la_OBJECTS = \ -+ $(am_liborg_gnome_mail_notification_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-notification.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) -+DATA = $(plugin_DATA) $(schema_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-notification/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mail-notification/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mail-notification.la: $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_DEPENDENCIES) -- $(liborg_gnome_mail_notification_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_notification_la_LDFLAGS) $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -493,66 +499,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-notification.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -561,7 +593,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -573,11 +604,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -600,23 +630,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -631,10 +666,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) $(DESTDIR)$(schemadir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -656,7 +690,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -672,14 +706,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -687,20 +719,12 @@ - install-data-am: install-data-local install-pluginDATA \ - install-pluginLTLIBRARIES install-schemaDATA - --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 -@@ -721,25 +745,21 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ -- uninstall-schemaDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES uninstall-schemaDATA - - .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-data-local 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-ps \ -- install-ps-am install-schemaDATA 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 \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-data-local \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pluginDATA install-pluginLTLIBRARIES \ -+ install-schemaDATA 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-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA - - -diff -ruN evolution-2.12.2.orig/plugins/mail-remote/Makefile.in evolution-2.12.2/plugins/mail-remote/Makefile.in ---- evolution-2.12.2.orig/plugins/mail-remote/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/mail-remote/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,84 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = client$(EXEEXT) --subdir = plugins/mail-remote --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_evolution_mail_remote_la_LIBADD = --am__objects_1 = Evolution-DataServer-Mail-common.lo \ -- Evolution-DataServer-Mail-skels.lo \ -- Evolution-DataServer-Mail-stubs.lo --am__objects_2 = --am_liborg_gnome_evolution_mail_remote_la_OBJECTS = $(am__objects_1) \ -- $(am__objects_2) e-corba-utils.lo em-message-stream.lo \ -- evolution-mail-folder.lo evolution-mail-folderlistener.lo \ -- evolution-mail-marshal.lo evolution-mail-messageiterator.lo \ -- evolution-mail-messagestream.lo evolution-mail-session.lo \ -- evolution-mail-sessionlistener.lo evolution-mail-store.lo \ -- evolution-mail-storelistener.lo mail-remote.lo --liborg_gnome_evolution_mail_remote_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_mail_remote_la_OBJECTS) --liborg_gnome_evolution_mail_remote_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_mail_remote_la_LDFLAGS) $(LDFLAGS) -o \ -- $@ --PROGRAMS = $(noinst_PROGRAMS) --am_client_OBJECTS = client.$(OBJEXT) --client_OBJECTS = $(am_client_OBJECTS) --am__DEPENDENCIES_1 = --client_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- evolution-mail-sessionlistener.o \ -- evolution-mail-storelistener.o evolution-mail-folderlistener.o \ -- evolution-mail-marshal.o evolution-mail-messagestream.o \ -- Evolution-DataServer-Mail-common.o \ -- Evolution-DataServer-Mail-stubs.o \ -- Evolution-DataServer-Mail-skels.o Evolution-common.o \ -- Evolution-stubs.o --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) \ -- $(client_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) \ -- $(client_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -143,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -154,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -179,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -204,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -212,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -270,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -294,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -318,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -326,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -333,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -342,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -364,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -394,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -413,18 +384,18 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-evolution-mail-remote.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-mail-remote.la -+ - liborg_gnome_evolution_mail_remote_la_SOURCES = \ - $(IDL_GENERATED_C) \ - $(IDL_GENERATED_H) \ -@@ -452,10 +423,13 @@ - evolution-mail-storelistener.h \ - mail-remote.c - -+ - liborg_gnome_evolution_mail_remote_la_LDFLAGS = -module -avoid-version -+ - client_SOURCES = \ - client.c - -+ - client_LDADD = \ - $(EVOLUTION_MAIL_LIBS) \ - evolution-mail-sessionlistener.o \ -@@ -470,16 +444,24 @@ - Evolution-stubs.o - - -+noinst_PROGRAMS = \ -+ client -+ -+ -+ - # mail idl - IDL = Evolution-DataServer-Mail.idl -+ - IDL_GENERATED_H = \ - Evolution-DataServer-Mail.h - -+ - IDL_GENERATED_C = \ - Evolution-DataServer-Mail-common.c \ - Evolution-DataServer-Mail-skels.c \ - Evolution-DataServer-Mail-stubs.c - -+ - EVO_GENERATED = Evolution.h Evolution-common.c Evolution-stubs.c Evolution-skels.c - - # installed idls -@@ -488,77 +470,123 @@ - - # marshallers for glib - MARSHAL_GENERATED = evolution-mail-marshal.c evolution-mail-marshal.h -+ - EXTRA_DIST = \ - $(IDL) \ - Evolution.idl \ - evolution-mail-marshal.list \ - org-gnome-evolution-mail-remote.eplug.xml - -+ - BUILT_SOURCES = $(IDL_GENERATED_H) $(IDL_GENERATED_C) $(MARSHAL_GENERATED) $(SHELL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mail-remote -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_mail_remote_la_LIBADD = -+am__objects_1 = Evolution-DataServer-Mail-common.lo \ -+ Evolution-DataServer-Mail-skels.lo \ -+ Evolution-DataServer-Mail-stubs.lo -+am__objects_2 = -+am_liborg_gnome_evolution_mail_remote_la_OBJECTS = $(am__objects_1) \ -+ $(am__objects_2) e-corba-utils.lo em-message-stream.lo \ -+ evolution-mail-folder.lo evolution-mail-folderlistener.lo \ -+ evolution-mail-marshal.lo evolution-mail-messageiterator.lo \ -+ evolution-mail-messagestream.lo evolution-mail-session.lo \ -+ evolution-mail-sessionlistener.lo evolution-mail-store.lo \ -+ evolution-mail-storelistener.lo mail-remote.lo -+liborg_gnome_evolution_mail_remote_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_mail_remote_la_OBJECTS) -+noinst_PROGRAMS = client$(EXEEXT) -+PROGRAMS = $(noinst_PROGRAMS) -+ -+am_client_OBJECTS = client.$(OBJEXT) -+client_OBJECTS = $(am_client_OBJECTS) -+client_DEPENDENCIES = evolution-mail-sessionlistener.o \ -+ evolution-mail-storelistener.o evolution-mail-folderlistener.o \ -+ evolution-mail-marshal.o evolution-mail-messagestream.o \ -+ Evolution-DataServer-Mail-common.o \ -+ Evolution-DataServer-Mail-stubs.o \ -+ Evolution-DataServer-Mail-skels.o Evolution-common.o \ -+ Evolution-stubs.o -+client_LDFLAGS = -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-DataServer-Mail-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-Mail-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-Mail-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/client.Po ./$(DEPDIR)/e-corba-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/em-message-stream.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-folder.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-folderlistener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-messageiterator.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-messagestream.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-session.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-sessionlistener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-store.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-mail-storelistener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/mail-remote.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) \ -+ $(client_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_mail_remote_la_SOURCES) $(client_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-remote/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mail-remote/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-mail-remote.la: $(liborg_gnome_evolution_mail_remote_la_OBJECTS) $(liborg_gnome_evolution_mail_remote_la_DEPENDENCIES) -- $(liborg_gnome_evolution_mail_remote_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_remote_la_OBJECTS) $(liborg_gnome_evolution_mail_remote_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mail_remote_la_LDFLAGS) $(liborg_gnome_evolution_mail_remote_la_OBJECTS) $(liborg_gnome_evolution_mail_remote_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -568,10 +596,10 @@ - done - client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) - @rm -f client$(EXEEXT) -- $(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS) -+ $(LINK) $(client_LDFLAGS) $(client_OBJECTS) $(client_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -594,49 +622,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-remote.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -645,7 +698,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -657,11 +709,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -684,23 +735,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -715,10 +771,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -740,7 +795,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -755,34 +810,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -803,24 +848,21 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ uninstall-pluginLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS 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-ps \ -- install-ps-am 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 -+ distclean-libtool distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ -+ uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.12.2.orig/plugins/mail-to-meeting/Makefile.in evolution-2.12.2/plugins/mail-to-meeting/Makefile.in ---- evolution-2.12.2.orig/plugins/mail-to-meeting/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/mail-to-meeting/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mail-to-meeting --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_mail_to_meeting_la_LIBADD = --am_liborg_gnome_mail_to_meeting_la_OBJECTS = mail-to-meeting.lo --liborg_gnome_mail_to_meeting_la_OBJECTS = \ -- $(am_liborg_gnome_mail_to_meeting_la_OBJECTS) --liborg_gnome_mail_to_meeting_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_mail_to_meeting_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,89 +384,96 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-mail-to-meeting.eplug - plugin_LTLIBRARIES = liborg-gnome-mail-to-meeting.la -+ - liborg_gnome_mail_to_meeting_la_SOURCES = mail-to-meeting.c - liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-mail-to-meeting.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mail-to-meeting -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mail_to_meeting_la_LIBADD = -+am_liborg_gnome_mail_to_meeting_la_OBJECTS = mail-to-meeting.lo -+liborg_gnome_mail_to_meeting_la_OBJECTS = \ -+ $(am_liborg_gnome_mail_to_meeting_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-to-meeting.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mail_to_meeting_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-to-meeting/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mail-to-meeting/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mail-to-meeting.la: $(liborg_gnome_mail_to_meeting_la_OBJECTS) $(liborg_gnome_mail_to_meeting_la_DEPENDENCIES) -- $(liborg_gnome_mail_to_meeting_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_meeting_la_OBJECTS) $(liborg_gnome_mail_to_meeting_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_meeting_la_LDFLAGS) $(liborg_gnome_mail_to_meeting_la_OBJECTS) $(liborg_gnome_mail_to_meeting_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -476,49 +481,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-to-meeting.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -527,7 +557,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,11 +568,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,23 +594,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +630,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -622,7 +654,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +669,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -685,23 +707,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/mail-to-task/Makefile.in evolution-2.12.2/plugins/mail-to-task/Makefile.in ---- evolution-2.12.2.orig/plugins/mail-to-task/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/mail-to-task/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mail-to-task --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_mail_to_task_la_LIBADD = --am_liborg_gnome_mail_to_task_la_OBJECTS = mail-to-task.lo --liborg_gnome_mail_to_task_la_OBJECTS = \ -- $(am_liborg_gnome_mail_to_task_la_OBJECTS) --liborg_gnome_mail_to_task_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_mail_to_task_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,91 +384,98 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-mail-to-task.eplug org-gnome-mail-to-task.xml - plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la -+ - liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c - liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \ - org-gnome-mail-to-task.xml - -+ - BUILT_SOURCES = org-gnome-mail-to-task.eplug - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mail-to-task -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mail_to_task_la_LIBADD = -+am_liborg_gnome_mail_to_task_la_OBJECTS = mail-to-task.lo -+liborg_gnome_mail_to_task_la_OBJECTS = \ -+ $(am_liborg_gnome_mail_to_task_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mail-to-task.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mail_to_task_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mail-to-task/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mail-to-task/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mail-to-task.la: $(liborg_gnome_mail_to_task_la_OBJECTS) $(liborg_gnome_mail_to_task_la_DEPENDENCIES) -- $(liborg_gnome_mail_to_task_la_LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_task_la_OBJECTS) $(liborg_gnome_mail_to_task_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mail_to_task_la_LDFLAGS) $(liborg_gnome_mail_to_task_la_OBJECTS) $(liborg_gnome_mail_to_task_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -478,49 +483,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-to-task.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -529,7 +559,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -541,11 +570,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -568,23 +596,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -599,10 +632,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -624,7 +656,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -639,34 +671,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -687,23 +709,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/Makefile.in evolution-2.12.2/plugins/Makefile.in ---- evolution-2.12.2.orig/plugins/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/Makefile.in 2007-12-05 15:54:56.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,36 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -92,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -103,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -128,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -153,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -161,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -219,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -243,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -267,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -275,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -282,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -291,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -313,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -343,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -362,46 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = $(plugins_enabled) - DIST_SUBDIRS = $(all_plugins_base) $(all_plugins_standard) $(all_plugins_experimental) profiler -+subdir = plugins -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -568,17 +578,13 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/plugins/mark-all-read/Makefile.in evolution-2.12.2/plugins/mark-all-read/Makefile.in ---- evolution-2.12.2.orig/plugins/mark-all-read/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/mark-all-read/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mark-all-read --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_mark_all_read_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_mark_all_read_la_OBJECTS = mark-all-read.lo --liborg_gnome_mark_all_read_la_OBJECTS = \ -- $(am_liborg_gnome_mark_all_read_la_OBJECTS) --liborg_gnome_mark_all_read_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_mark_all_read_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,19 +384,18 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)\ - -I$(top_srcdir)/camel \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-mark-all-read.eplug - plugin_LTLIBRARIES = liborg-gnome-mark-all-read.la -+ - liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c - liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_mark_all_read_la_LIBADD = \ -@@ -410,75 +403,85 @@ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) - -+ - EXTRA_DIST = org-gnome-mark-all-read.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mark-all-read -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mark_all_read_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_liborg_gnome_mark_all_read_la_OBJECTS = mark-all-read.lo -+liborg_gnome_mark_all_read_la_OBJECTS = \ -+ $(am_liborg_gnome_mark_all_read_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mark-all-read.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mark_all_read_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mark-all-read/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mark-all-read/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mark-all-read.la: $(liborg_gnome_mark_all_read_la_OBJECTS) $(liborg_gnome_mark_all_read_la_DEPENDENCIES) -- $(liborg_gnome_mark_all_read_la_LINK) -rpath $(plugindir) $(liborg_gnome_mark_all_read_la_OBJECTS) $(liborg_gnome_mark_all_read_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mark_all_read_la_LDFLAGS) $(liborg_gnome_mark_all_read_la_OBJECTS) $(liborg_gnome_mark_all_read_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -486,49 +489,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark-all-read.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -537,7 +565,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -549,11 +576,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -576,23 +602,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -607,10 +638,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -632,7 +662,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -647,34 +677,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -695,23 +715,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/mark-calendar-offline/Makefile.in evolution-2.12.2/plugins/mark-calendar-offline/Makefile.in ---- evolution-2.12.2.orig/plugins/mark-calendar-offline/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/mark-calendar-offline/Makefile.in 2007-12-05 15:55:00.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mark-calendar-offline --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_mark_calendar_offline_la_LIBADD = --am_liborg_gnome_mark_calendar_offline_la_OBJECTS = \ -- mark-calendar-offline.lo --liborg_gnome_mark_calendar_offline_la_OBJECTS = \ -- $(am_liborg_gnome_mark_calendar_offline_la_OBJECTS) --liborg_gnome_mark_calendar_offline_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_mark_calendar_offline_la_LDFLAGS) $(LDFLAGS) -o \ -- $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,89 +384,97 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - plugin_DATA = org-gnome-mark-calendar-offline.eplug - plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la -+ - liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c - liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mark-calendar-offline -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_mark_calendar_offline_la_LIBADD = -+am_liborg_gnome_mark_calendar_offline_la_OBJECTS = \ -+ mark-calendar-offline.lo -+liborg_gnome_mark_calendar_offline_la_OBJECTS = \ -+ $(am_liborg_gnome_mark_calendar_offline_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mark-calendar-offline.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_mark_calendar_offline_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mark-calendar-offline/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mark-calendar-offline/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-mark-calendar-offline.la: $(liborg_gnome_mark_calendar_offline_la_OBJECTS) $(liborg_gnome_mark_calendar_offline_la_DEPENDENCIES) -- $(liborg_gnome_mark_calendar_offline_la_LINK) -rpath $(plugindir) $(liborg_gnome_mark_calendar_offline_la_OBJECTS) $(liborg_gnome_mark_calendar_offline_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_mark_calendar_offline_la_LDFLAGS) $(liborg_gnome_mark_calendar_offline_la_OBJECTS) $(liborg_gnome_mark_calendar_offline_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -478,49 +482,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark-calendar-offline.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -529,7 +558,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -541,11 +569,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -568,23 +595,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -599,10 +631,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -624,7 +655,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -639,34 +670,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -687,23 +708,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/mono/Makefile.in evolution-2.12.2/plugins/mono/Makefile.in ---- evolution-2.12.2.orig/plugins/mono/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/mono/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/mono --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_evolution_mono_la_DEPENDENCIES = $(am__DEPENDENCIES_1) --am_liborg_gnome_evolution_mono_la_OBJECTS = mono-plugin.lo --liborg_gnome_evolution_mono_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_mono_la_OBJECTS) --liborg_gnome_evolution_mono_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_mono_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,92 +384,99 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) - -+ - plugin_DATA = org-gnome-evolution-mono.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la -+ - liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h - liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version - liborg_gnome_evolution_mono_la_LIBADD = \ - $(E_UTIL_LIBS) - -+ - EXTRA_DIST = org-gnome-evolution-mono.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/mono -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_mono_la_DEPENDENCIES = -+am_liborg_gnome_evolution_mono_la_OBJECTS = mono-plugin.lo -+liborg_gnome_evolution_mono_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_mono_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mono-plugin.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_mono_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mono/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/mono/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-mono.la: $(liborg_gnome_evolution_mono_la_OBJECTS) $(liborg_gnome_evolution_mono_la_DEPENDENCIES) -- $(liborg_gnome_evolution_mono_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mono_la_OBJECTS) $(liborg_gnome_evolution_mono_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_mono_la_LDFLAGS) $(liborg_gnome_evolution_mono_la_OBJECTS) $(liborg_gnome_evolution_mono_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -480,49 +484,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -531,7 +560,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -543,11 +571,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -570,23 +597,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -601,10 +633,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -626,7 +657,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -641,34 +672,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -689,23 +710,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/new-mail-notify/Makefile.in evolution-2.12.2/plugins/new-mail-notify/Makefile.in ---- evolution-2.12.2.orig/plugins/new-mail-notify/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/new-mail-notify/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/new-mail-notify --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_new_mail_notify_la_LIBADD = --am_liborg_gnome_new_mail_notify_la_OBJECTS = new-mail-notify.lo --liborg_gnome_new_mail_notify_la_OBJECTS = \ -- $(am_liborg_gnome_new_mail_notify_la_OBJECTS) --liborg_gnome_new_mail_notify_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_new_mail_notify_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -236,6 +230,7 @@ - LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ - LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ - LIBOBJS = @LIBOBJS@ -+ - LIBS = \ - $(NMN_LIBS) - -@@ -245,22 +240,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +268,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +294,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +303,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +312,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +320,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +340,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +369,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,11 +387,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_builddir)/composer \ -@@ -402,79 +398,89 @@ - $(EVOLUTION_MAIL_CFLAGS) \ - $(NMN_CFLAGS) - -+ - plugin_DATA = org-gnome-new-mail-notify.eplug - plugin_LTLIBRARIES = liborg-gnome-new-mail-notify.la -+ - liborg_gnome_new_mail_notify_la_SOURCES = new-mail-notify.c - liborg_gnome_new_mail_notify_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-new-mail-notify.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/new-mail-notify -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_new_mail_notify_la_LIBADD = -+am_liborg_gnome_new_mail_notify_la_OBJECTS = new-mail-notify.lo -+liborg_gnome_new_mail_notify_la_OBJECTS = \ -+ $(am_liborg_gnome_new_mail_notify_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/new-mail-notify.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_new_mail_notify_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/new-mail-notify/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/new-mail-notify/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-new-mail-notify.la: $(liborg_gnome_new_mail_notify_la_OBJECTS) $(liborg_gnome_new_mail_notify_la_DEPENDENCIES) -- $(liborg_gnome_new_mail_notify_la_LINK) -rpath $(plugindir) $(liborg_gnome_new_mail_notify_la_OBJECTS) $(liborg_gnome_new_mail_notify_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_new_mail_notify_la_LDFLAGS) $(liborg_gnome_new_mail_notify_la_OBJECTS) $(liborg_gnome_new_mail_notify_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -482,49 +488,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/new-mail-notify.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -533,7 +564,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -545,11 +575,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -572,23 +601,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -603,10 +637,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -628,7 +661,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -643,34 +676,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -691,23 +714,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/plugin-manager/Makefile.in evolution-2.12.2/plugins/plugin-manager/Makefile.in ---- evolution-2.12.2.orig/plugins/plugin-manager/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/plugins/plugin-manager/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/plugin-manager --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_plugin_manager_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_liborg_gnome_plugin_manager_la_OBJECTS = plugin-manager.lo --liborg_gnome_plugin_manager_la_OBJECTS = \ -- $(am_liborg_gnome_plugin_manager_la_OBJECTS) --liborg_gnome_plugin_manager_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_plugin_manager_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,96 +384,105 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-plugin-manager.eplug org-gnome-plugin-manager.xml - plugin_LTLIBRARIES = liborg-gnome-plugin-manager.la -+ - liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c - liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_plugin_manager_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_MAIL_LIBS) - -+ - EXTRA_DIST = \ - org-gnome-plugin-manager.eplug.xml \ - org-gnome-plugin-manager.xml - -+ - BUILT_SOURCES = org-gnome-plugin-manager.eplug -+ - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/plugin-manager -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_plugin_manager_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la -+am_liborg_gnome_plugin_manager_la_OBJECTS = plugin-manager.lo -+liborg_gnome_plugin_manager_la_OBJECTS = \ -+ $(am_liborg_gnome_plugin_manager_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plugin-manager.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_plugin_manager_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/plugin-manager/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/plugin-manager/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-plugin-manager.la: $(liborg_gnome_plugin_manager_la_OBJECTS) $(liborg_gnome_plugin_manager_la_DEPENDENCIES) -- $(liborg_gnome_plugin_manager_la_LINK) -rpath $(plugindir) $(liborg_gnome_plugin_manager_la_OBJECTS) $(liborg_gnome_plugin_manager_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_plugin_manager_la_LDFLAGS) $(liborg_gnome_plugin_manager_la_OBJECTS) $(liborg_gnome_plugin_manager_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -485,49 +490,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin-manager.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -536,7 +566,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -548,11 +577,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -575,23 +603,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -606,10 +639,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -631,7 +663,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -646,34 +678,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -694,23 +716,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/prefer-plain/Makefile.in evolution-2.12.2/plugins/prefer-plain/Makefile.in ---- evolution-2.12.2.orig/plugins/prefer-plain/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/prefer-plain/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/prefer-plain --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_prefer_plain_la_LIBADD = --am_liborg_gnome_prefer_plain_la_OBJECTS = prefer-plain.lo --liborg_gnome_prefer_plain_la_OBJECTS = \ -- $(am_liborg_gnome_prefer_plain_la_OBJECTS) --liborg_gnome_prefer_plain_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_prefer_plain_la_LDFLAGS) \ -- $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,89 +384,96 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-prefer-plain.eplug - plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la -+ - liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c - liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-prefer-plain.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/prefer-plain -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_prefer_plain_la_LIBADD = -+am_liborg_gnome_prefer_plain_la_OBJECTS = prefer-plain.lo -+liborg_gnome_prefer_plain_la_OBJECTS = \ -+ $(am_liborg_gnome_prefer_plain_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/prefer-plain.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_prefer_plain_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/prefer-plain/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/prefer-plain/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-prefer-plain.la: $(liborg_gnome_prefer_plain_la_OBJECTS) $(liborg_gnome_prefer_plain_la_DEPENDENCIES) -- $(liborg_gnome_prefer_plain_la_LINK) -rpath $(plugindir) $(liborg_gnome_prefer_plain_la_OBJECTS) $(liborg_gnome_prefer_plain_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_prefer_plain_la_LDFLAGS) $(liborg_gnome_prefer_plain_la_OBJECTS) $(liborg_gnome_prefer_plain_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -476,49 +481,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefer-plain.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -527,7 +557,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,11 +568,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,23 +594,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +630,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -622,7 +654,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +669,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -685,23 +707,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/print-message/Makefile.in evolution-2.12.2/plugins/print-message/Makefile.in ---- evolution-2.12.2.orig/plugins/print-message/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/print-message/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/print-message --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_print_message_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_print_message_la_OBJECTS = print-message.lo --liborg_gnome_print_message_la_OBJECTS = \ -- $(am_liborg_gnome_print_message_la_OBJECTS) --liborg_gnome_print_message_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_print_message_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_print_message_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_print_message_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,19 +384,18 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/composer \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-print-message.eplug org-gnome-print-message.xml - plugin_LTLIBRARIES = liborg-gnome-print-message.la -+ - liborg_gnome_print_message_la_SOURCES = print-message.c - liborg_gnome_print_message_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - liborg_gnome_print_message_la_LIBADD = \ -@@ -410,78 +403,88 @@ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) - -+ - EXTRA_DIST = \ - org-gnome-print-message.eplug.xml\ - org-gnome-print-message.xml - -+ - BUILT_SOURCES = org-gnome-print-message.eplug - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/print-message -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_print_message_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_liborg_gnome_print_message_la_OBJECTS = print-message.lo -+liborg_gnome_print_message_la_OBJECTS = \ -+ $(am_liborg_gnome_print_message_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/print-message.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_print_message_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_print_message_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/print-message/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/print-message/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-print-message.la: $(liborg_gnome_print_message_la_OBJECTS) $(liborg_gnome_print_message_la_DEPENDENCIES) -- $(liborg_gnome_print_message_la_LINK) -rpath $(plugindir) $(liborg_gnome_print_message_la_OBJECTS) $(liborg_gnome_print_message_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_print_message_la_LDFLAGS) $(liborg_gnome_print_message_la_OBJECTS) $(liborg_gnome_print_message_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -489,49 +492,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-message.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -540,7 +568,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -552,11 +579,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -579,23 +605,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -610,10 +641,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -635,7 +665,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -650,34 +680,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -698,23 +718,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/profiler/Makefile.in evolution-2.12.2/plugins/profiler/Makefile.in ---- evolution-2.12.2.orig/plugins/profiler/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/profiler/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/profiler --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_evolution_profiler_la_LIBADD = --am_liborg_gnome_evolution_profiler_la_OBJECTS = profiler.lo --liborg_gnome_evolution_profiler_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_profiler_la_OBJECTS) --liborg_gnome_evolution_profiler_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_profiler_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -236,6 +230,7 @@ - LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ - LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ - LIBOBJS = @LIBOBJS@ -+ - LIBS = $(SHELL_LIBS) - LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ - LIBSOUP_LIBS = @LIBSOUP_LIBS@ -@@ -243,22 +238,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +266,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +292,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +301,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +310,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +318,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +338,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +367,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,89 +385,96 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(SHELL_CFLAGS) - -+ - plugin_DATA = org-gnome-evolution-profiler.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-profiler.la -+ - liborg_gnome_evolution_profiler_la_SOURCES = profiler.c - liborg_gnome_evolution_profiler_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-evolution-profiler.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/profiler -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_profiler_la_LIBADD = -+am_liborg_gnome_evolution_profiler_la_OBJECTS = profiler.lo -+liborg_gnome_evolution_profiler_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_profiler_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/profiler.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_profiler_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/profiler/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/profiler/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-profiler.la: $(liborg_gnome_evolution_profiler_la_OBJECTS) $(liborg_gnome_evolution_profiler_la_DEPENDENCIES) -- $(liborg_gnome_evolution_profiler_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_profiler_la_OBJECTS) $(liborg_gnome_evolution_profiler_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_profiler_la_LDFLAGS) $(liborg_gnome_evolution_profiler_la_OBJECTS) $(liborg_gnome_evolution_profiler_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -476,49 +482,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profiler.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -527,7 +558,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,11 +569,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,23 +595,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +631,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -622,7 +655,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +670,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -685,23 +708,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/publish-calendar/Makefile.in evolution-2.12.2/plugins/publish-calendar/Makefile.in ---- evolution-2.12.2.orig/plugins/publish-calendar/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/publish-calendar/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,66 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/publish-calendar --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" \ -- "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_publish_calendar_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/calendar/gui/libevolution-calendar.la \ -- $(am__DEPENDENCIES_1) --am_liborg_gnome_publish_calendar_la_OBJECTS = publish-calendar.lo \ -- publish-format-fb.lo publish-format-ical.lo \ -- publish-location.lo url-editor-dialog.lo --liborg_gnome_publish_calendar_la_OBJECTS = \ -- $(am_liborg_gnome_publish_calendar_la_OBJECTS) --liborg_gnome_publish_calendar_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_publish_calendar_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -124,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -135,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -160,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -185,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -193,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -251,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -275,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -299,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -307,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -314,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -323,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -345,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -375,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -394,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -407,14 +394,18 @@ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - -+ - plugin_DATA = \ - org-gnome-publish-calendar.eplug \ - org-gnome-publish-calendar.xml - -+ - glade_DATA = \ - publish-calendar.glade - -+ - plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la -+ - liborg_gnome_publish_calendar_la_SOURCES = \ - publish-calendar.c \ - publish-format-fb.c \ -@@ -426,83 +417,101 @@ - url-editor-dialog.c \ - url-editor-dialog.h - -+ - liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - liborg_gnome_publish_calendar_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - EXTRA_DIST = \ - org-gnome-publish-calendar.eplug.xml \ - org-gnome-publish-calendar.xml \ - $(glade_DATA) - -+ - CLEANFILES = org-gnome-publish-calendar.eplug -+subdir = plugins/publish-calendar -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_publish_calendar_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/calendar/gui/libevolution-calendar.la -+am_liborg_gnome_publish_calendar_la_OBJECTS = publish-calendar.lo \ -+ publish-format-fb.lo publish-format-ical.lo publish-location.lo \ -+ url-editor-dialog.lo -+liborg_gnome_publish_calendar_la_OBJECTS = \ -+ $(am_liborg_gnome_publish_calendar_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/publish-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/publish-format-fb.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/publish-format-ical.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/publish-location.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/url-editor-dialog.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) -+DATA = $(glade_DATA) $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_publish_calendar_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/publish-calendar/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/publish-calendar/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-publish-calendar.la: $(liborg_gnome_publish_calendar_la_OBJECTS) $(liborg_gnome_publish_calendar_la_DEPENDENCIES) -- $(liborg_gnome_publish_calendar_la_LINK) -rpath $(plugindir) $(liborg_gnome_publish_calendar_la_OBJECTS) $(liborg_gnome_publish_calendar_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_publish_calendar_la_LDFLAGS) $(liborg_gnome_publish_calendar_la_OBJECTS) $(liborg_gnome_publish_calendar_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -514,66 +523,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url-editor-dialog.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -582,7 +617,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -594,11 +628,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -621,23 +654,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -651,10 +689,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(gladedir) $(DESTDIR)$(plugindir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -675,7 +712,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -689,14 +726,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -704,20 +739,12 @@ - install-data-am: install-gladeDATA install-pluginDATA \ - 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 -@@ -738,25 +765,21 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-pluginDATA \ -+uninstall-am: uninstall-gladeDATA uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - --.MAKE: install-am install-strip -- - .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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-man install-pluginDATA 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-gladeDATA uninstall-pluginDATA \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-gladeDATA \ -+ uninstall-info-am uninstall-pluginDATA \ - uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/sa-junk-plugin/Makefile.in evolution-2.12.2/plugins/sa-junk-plugin/Makefile.in ---- evolution-2.12.2.orig/plugins/sa-junk-plugin/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/plugins/sa-junk-plugin/Makefile.in 2007-12-05 15:55:01.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/sa-junk-plugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_sa_junk_plugin_la_LIBADD = --am_liborg_gnome_sa_junk_plugin_la_OBJECTS = em-junk-filter.lo --liborg_gnome_sa_junk_plugin_la_OBJECTS = \ -- $(am_liborg_gnome_sa_junk_plugin_la_OBJECTS) --liborg_gnome_sa_junk_plugin_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_sa_junk_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,91 +384,99 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-sa-junk-plugin.eplug - plugin_LTLIBRARIES = liborg-gnome-sa-junk-plugin.la -+ - liborg_gnome_sa_junk_plugin_la_SOURCES = em-junk-filter.c - liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - BUILT_SOURCES = $(plugin_DATA) $(error_DATA) -+ - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = \ - org-gnome-sa-junk-plugin.eplug.xml - -+subdir = plugins/sa-junk-plugin -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_sa_junk_plugin_la_LIBADD = -+am_liborg_gnome_sa_junk_plugin_la_OBJECTS = em-junk-filter.lo -+liborg_gnome_sa_junk_plugin_la_OBJECTS = \ -+ $(am_liborg_gnome_sa_junk_plugin_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/em-junk-filter.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_sa_junk_plugin_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/sa-junk-plugin/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/sa-junk-plugin/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-sa-junk-plugin.la: $(liborg_gnome_sa_junk_plugin_la_OBJECTS) $(liborg_gnome_sa_junk_plugin_la_DEPENDENCIES) -- $(liborg_gnome_sa_junk_plugin_la_LINK) -rpath $(plugindir) $(liborg_gnome_sa_junk_plugin_la_OBJECTS) $(liborg_gnome_sa_junk_plugin_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_sa_junk_plugin_la_LDFLAGS) $(liborg_gnome_sa_junk_plugin_la_OBJECTS) $(liborg_gnome_sa_junk_plugin_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -478,49 +484,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/em-junk-filter.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -529,7 +560,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -541,11 +571,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -568,23 +597,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -599,10 +633,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -624,7 +657,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -639,34 +672,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -687,23 +710,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/save-attachments/Makefile.in evolution-2.12.2/plugins/save-attachments/Makefile.in ---- evolution-2.12.2.orig/plugins/save-attachments/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/save-attachments/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/save-attachments --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_save_attachments_la_LIBADD = --am_liborg_gnome_save_attachments_la_OBJECTS = save-attachments.lo --liborg_gnome_save_attachments_la_OBJECTS = \ -- $(am_liborg_gnome_save_attachments_la_OBJECTS) --liborg_gnome_save_attachments_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_save_attachments_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,92 +384,99 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-save-attachments.eplug org-gnome-save-attachments.xml - plugin_LTLIBRARIES = liborg-gnome-save-attachments.la -+ - liborg_gnome_save_attachments_la_SOURCES = save-attachments.c - liborg_gnome_save_attachments_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = \ - org-gnome-save-attachments.eplug.xml \ - org-gnome-save-attachments.xml - -+ - BUILT_SOURCES = org-gnome-save-attachments.eplug - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/save-attachments -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_save_attachments_la_LIBADD = -+am_liborg_gnome_save_attachments_la_OBJECTS = save-attachments.lo -+liborg_gnome_save_attachments_la_OBJECTS = \ -+ $(am_liborg_gnome_save_attachments_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/save-attachments.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_save_attachments_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/save-attachments/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/save-attachments/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-save-attachments.la: $(liborg_gnome_save_attachments_la_OBJECTS) $(liborg_gnome_save_attachments_la_DEPENDENCIES) -- $(liborg_gnome_save_attachments_la_LINK) -rpath $(plugindir) $(liborg_gnome_save_attachments_la_OBJECTS) $(liborg_gnome_save_attachments_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_save_attachments_la_LDFLAGS) $(liborg_gnome_save_attachments_la_OBJECTS) $(liborg_gnome_save_attachments_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -479,49 +484,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-attachments.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -530,7 +560,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -542,11 +571,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -569,23 +597,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -600,10 +633,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -625,7 +657,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -640,34 +672,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -688,23 +710,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/save-calendar/Makefile.in evolution-2.12.2/plugins/save-calendar/Makefile.in ---- evolution-2.12.2.orig/plugins/save-calendar/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/save-calendar/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,59 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/save-calendar --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_save_calendar_la_LIBADD = --am_liborg_gnome_save_calendar_la_OBJECTS = save-calendar.lo \ -- ical-format.lo csv-format.lo rdf-format.lo --liborg_gnome_save_calendar_la_OBJECTS = \ -- $(am_liborg_gnome_save_calendar_la_OBJECTS) --liborg_gnome_save_calendar_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_save_calendar_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -117,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -128,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -153,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -178,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -186,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -244,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -268,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -292,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -300,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -307,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -316,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -338,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -368,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -387,18 +384,17 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - plugin_DATA = org-gnome-save-calendar.eplug - plugin_LTLIBRARIES = liborg-gnome-save-calendar.la -+ - liborg_gnome_save_calendar_la_SOURCES = \ - save-calendar.c \ - ical-format.c \ -@@ -406,76 +402,89 @@ - rdf-format.c \ - format-handler.h - -+ - liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-save-calendar.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/save-calendar -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_save_calendar_la_LIBADD = -+am_liborg_gnome_save_calendar_la_OBJECTS = save-calendar.lo \ -+ ical-format.lo csv-format.lo rdf-format.lo -+liborg_gnome_save_calendar_la_OBJECTS = \ -+ $(am_liborg_gnome_save_calendar_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/csv-format.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/ical-format.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rdf-format.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/save-calendar.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_save_calendar_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/save-calendar/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/save-calendar/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-save-calendar.la: $(liborg_gnome_save_calendar_la_OBJECTS) $(liborg_gnome_save_calendar_la_DEPENDENCIES) -- $(liborg_gnome_save_calendar_la_LINK) -rpath $(plugindir) $(liborg_gnome_save_calendar_la_OBJECTS) $(liborg_gnome_save_calendar_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_save_calendar_la_LDFLAGS) $(liborg_gnome_save_calendar_la_OBJECTS) $(liborg_gnome_save_calendar_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -486,49 +495,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-calendar.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -537,7 +571,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -549,11 +582,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -576,23 +608,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -607,10 +644,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -632,7 +668,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -647,34 +683,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -695,23 +721,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/select-one-source/Makefile.in evolution-2.12.2/plugins/select-one-source/Makefile.in ---- evolution-2.12.2.orig/plugins/select-one-source/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/select-one-source/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/select-one-source --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_select_one_source_la_LIBADD = --am_liborg_gnome_select_one_source_la_OBJECTS = select-one-source.lo --liborg_gnome_select_one_source_la_OBJECTS = \ -- $(am_liborg_gnome_select_one_source_la_OBJECTS) --liborg_gnome_select_one_source_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_select_one_source_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,89 +384,96 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) - -+ - plugin_DATA = org-gnome-select-one-source.eplug - plugin_LTLIBRARIES = liborg-gnome-select-one-source.la -+ - liborg_gnome_select_one_source_la_SOURCES = select-one-source.c - liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-select-one-source.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/select-one-source -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_select_one_source_la_LIBADD = -+am_liborg_gnome_select_one_source_la_OBJECTS = select-one-source.lo -+liborg_gnome_select_one_source_la_OBJECTS = \ -+ $(am_liborg_gnome_select_one_source_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/select-one-source.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_select_one_source_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/select-one-source/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/select-one-source/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-select-one-source.la: $(liborg_gnome_select_one_source_la_OBJECTS) $(liborg_gnome_select_one_source_la_DEPENDENCIES) -- $(liborg_gnome_select_one_source_la_LINK) -rpath $(plugindir) $(liborg_gnome_select_one_source_la_OBJECTS) $(liborg_gnome_select_one_source_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_select_one_source_la_LDFLAGS) $(liborg_gnome_select_one_source_la_OBJECTS) $(liborg_gnome_select_one_source_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -476,49 +481,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-one-source.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -527,7 +557,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,11 +568,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,23 +594,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +630,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -622,7 +654,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +669,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -685,23 +707,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/startup-wizard/Makefile.in evolution-2.12.2/plugins/startup-wizard/Makefile.in ---- evolution-2.12.2.orig/plugins/startup-wizard/Makefile.in 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/startup-wizard/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,67 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/startup-wizard --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --am__DEPENDENCIES_1 = --liborg_gnome_evolution_startup_wizard_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/calendar/gui/libevolution-calendar.la \ -- $(top_builddir)/mail/libevolution-mail.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_liborg_gnome_evolution_startup_wizard_la_OBJECTS = \ -- startup-wizard.lo --liborg_gnome_evolution_startup_wizard_la_OBJECTS = \ -- $(am_liborg_gnome_evolution_startup_wizard_la_OBJECTS) --liborg_gnome_evolution_startup_wizard_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_evolution_startup_wizard_la_LDFLAGS) $(LDFLAGS) \ -- -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -125,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -136,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -161,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -186,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -194,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -252,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -276,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -300,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -308,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -315,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -324,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -346,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -376,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -395,22 +384,22 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = -I . \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-evolution-startup-wizard.eplug - plugin_LTLIBRARIES = liborg-gnome-evolution-startup-wizard.la -+ - liborg_gnome_evolution_startup_wizard_la_SOURCES = \ - startup-wizard.c - -+ - liborg_gnome_evolution_startup_wizard_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -@@ -420,76 +409,90 @@ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) - -+ - liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -+ - EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/startup-wizard -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_evolution_startup_wizard_la_DEPENDENCIES = \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/calendar/gui/libevolution-calendar.la \ -+ $(top_builddir)/mail/libevolution-mail.la -+am_liborg_gnome_evolution_startup_wizard_la_OBJECTS = startup-wizard.lo -+liborg_gnome_evolution_startup_wizard_la_OBJECTS = \ -+ $(am_liborg_gnome_evolution_startup_wizard_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/startup-wizard.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_evolution_startup_wizard_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/startup-wizard/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/startup-wizard/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-evolution-startup-wizard.la: $(liborg_gnome_evolution_startup_wizard_la_OBJECTS) $(liborg_gnome_evolution_startup_wizard_la_DEPENDENCIES) -- $(liborg_gnome_evolution_startup_wizard_la_LINK) -rpath $(plugindir) $(liborg_gnome_evolution_startup_wizard_la_OBJECTS) $(liborg_gnome_evolution_startup_wizard_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_evolution_startup_wizard_la_LDFLAGS) $(liborg_gnome_evolution_startup_wizard_la_OBJECTS) $(liborg_gnome_evolution_startup_wizard_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -497,49 +500,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/startup-wizard.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -548,7 +576,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -560,11 +587,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -587,23 +613,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -618,10 +649,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -643,7 +673,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -658,34 +688,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -706,23 +726,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/subject-thread/Makefile.in evolution-2.12.2/plugins/subject-thread/Makefile.in ---- evolution-2.12.2.orig/plugins/subject-thread/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/subject-thread/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/subject-thread --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_subject_thread_la_LIBADD = --am_liborg_gnome_subject_thread_la_OBJECTS = subject-thread.lo --liborg_gnome_subject_thread_la_OBJECTS = \ -- $(am_liborg_gnome_subject_thread_la_OBJECTS) --liborg_gnome_subject_thread_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_subject_thread_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,89 +384,96 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-subject-thread.eplug - plugin_LTLIBRARIES = liborg-gnome-subject-thread.la -+ - liborg_gnome_subject_thread_la_SOURCES = subject-thread.c - liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version -+ - EXTRA_DIST = org-gnome-subject-thread.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/subject-thread -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_subject_thread_la_LIBADD = -+am_liborg_gnome_subject_thread_la_OBJECTS = subject-thread.lo -+liborg_gnome_subject_thread_la_OBJECTS = \ -+ $(am_liborg_gnome_subject_thread_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/subject-thread.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_subject_thread_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/subject-thread/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/subject-thread/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-subject-thread.la: $(liborg_gnome_subject_thread_la_OBJECTS) $(liborg_gnome_subject_thread_la_DEPENDENCIES) -- $(liborg_gnome_subject_thread_la_LINK) -rpath $(plugindir) $(liborg_gnome_subject_thread_la_OBJECTS) $(liborg_gnome_subject_thread_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_subject_thread_la_LDFLAGS) $(liborg_gnome_subject_thread_la_OBJECTS) $(liborg_gnome_subject_thread_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -476,49 +481,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subject-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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -527,7 +557,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,11 +568,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -566,23 +594,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -597,10 +630,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -622,7 +654,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -637,34 +669,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -685,23 +707,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/plugins/tnef-attachments/Makefile.in evolution-2.12.2/plugins/tnef-attachments/Makefile.in ---- evolution-2.12.2.orig/plugins/tnef-attachments/Makefile.in 2007-12-05 15:50:04.000000000 +0100 -+++ evolution-2.12.2/plugins/tnef-attachments/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = plugins/tnef-attachments --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" --pluginLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(plugin_LTLIBRARIES) --liborg_gnome_tnef_attachments_la_LIBADD = --am_liborg_gnome_tnef_attachments_la_OBJECTS = tnef-plugin.lo --liborg_gnome_tnef_attachments_la_OBJECTS = \ -- $(am_liborg_gnome_tnef_attachments_la_OBJECTS) --liborg_gnome_tnef_attachments_la_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) \ -- $(liborg_gnome_tnef_attachments_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) --DIST_SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) --pluginDATA_INSTALL = $(INSTALL_DATA) --DATA = $(plugin_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -116,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -127,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -152,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -177,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -185,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -243,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -267,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -291,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -299,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -306,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -315,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -337,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -367,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -386,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -398,79 +393,89 @@ - -DLOCALEDIR="\"$(LOCALEDIR)\"" \ - $(EVOLUTION_MAIL_CFLAGS) - -+ - plugin_DATA = org-gnome-tnef-attachments.eplug - plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la -+ - liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c - liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version -lytnef -+ - EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml -+ - BUILT_SOURCES = $(plugin_DATA) - CLEANFILES = $(BUILT_SOURCES) -+subdir = plugins/tnef-attachments -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(plugin_LTLIBRARIES) -+ -+liborg_gnome_tnef_attachments_la_LIBADD = -+am_liborg_gnome_tnef_attachments_la_OBJECTS = tnef-plugin.lo -+liborg_gnome_tnef_attachments_la_OBJECTS = \ -+ $(am_liborg_gnome_tnef_attachments_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tnef-plugin.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) -+DATA = $(plugin_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+SOURCES = $(liborg_gnome_tnef_attachments_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/tnef-attachments/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/tnef-attachments/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @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"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ - done - - clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - liborg-gnome-tnef-attachments.la: $(liborg_gnome_tnef_attachments_la_OBJECTS) $(liborg_gnome_tnef_attachments_la_DEPENDENCIES) -- $(liborg_gnome_tnef_attachments_la_LINK) -rpath $(plugindir) $(liborg_gnome_tnef_attachments_la_OBJECTS) $(liborg_gnome_tnef_attachments_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(plugindir) $(liborg_gnome_tnef_attachments_la_LDFLAGS) $(liborg_gnome_tnef_attachments_la_OBJECTS) $(liborg_gnome_tnef_attachments_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -478,49 +483,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnef-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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+pluginDATA_INSTALL = $(INSTALL_DATA) - install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f"; \ -+ $(pluginDATA_INSTALL) $$d$$p $(DESTDIR)$(plugindir)/$$f; \ - done - - uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(plugindir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(plugindir)/$$f"; \ -+ rm -f $(DESTDIR)$(plugindir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -529,7 +559,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -541,11 +570,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -568,23 +596,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -599,10 +632,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(plugindir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -624,7 +656,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -639,34 +671,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-pluginDATA 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 -@@ -687,23 +709,20 @@ - - ps-am: - --uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-pluginDATA \ -+ 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-pluginDATA \ -- install-pluginLTLIBRARIES install-ps install-ps-am \ -- 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 \ -+ distclean-tags distdir dvi dvi-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-pluginDATA 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-info-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -diff -ruN evolution-2.12.2.orig/shell/Makefile.in evolution-2.12.2/shell/Makefile.in ---- evolution-2.12.2.orig/shell/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/shell/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -14,15 +14,16 @@ - - @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 -@@ -34,130 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = evolution$(EXEEXT) --subdir = shell --DIST_COMMON = $(eshellinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in $(srcdir)/evolution-nognome.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = evolution-nognome --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(componentdir)" \ -- "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" \ -- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" \ -- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" \ -- "$(DESTDIR)$(testserverdir)" "$(DESTDIR)$(eshellincludedir)" --componentLTLIBRARIES_INSTALL = $(INSTALL) --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(component_LTLIBRARIES) $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libeshell_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(am__DEPENDENCIES_1) --am__objects_1 = --am__objects_2 = Evolution-common.lo Evolution-skels.lo \ -- Evolution-stubs.lo --am__objects_3 = $(am__objects_1) $(am__objects_2) --am__objects_4 = e-shell-marshal.lo --am_libeshell_la_OBJECTS = $(am__objects_3) $(am__objects_4) \ -- e-component-view.lo evolution-component.lo \ -- evolution-listener.lo e-shell-utils.lo \ -- e-user-creatable-items-handler.lo evolution-config-control.lo \ -- evolution-shell-component-utils.lo $(am__objects_1) --libeshell_la_OBJECTS = $(am_libeshell_la_OBJECTS) --libeshell_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libeshell_la_LDFLAGS) $(LDFLAGS) -o $@ --libevolution_test_la_DEPENDENCIES = libeshell.la $(am__DEPENDENCIES_1) --am_libevolution_test_la_OBJECTS = $(am__objects_3) \ -- evolution-test-component.lo --libevolution_test_la_OBJECTS = $(am_libevolution_test_la_OBJECTS) --libevolution_test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_test_la_LDFLAGS) $(LDFLAGS) -o $@ --@ENABLE_TEST_COMPONENT_TRUE@am_libevolution_test_la_rpath = -rpath \ --@ENABLE_TEST_COMPONENT_TRUE@ $(componentdir) --PROGRAMS = $(noinst_PROGRAMS) --am__evolution_SOURCES_DIST = Evolution-DataServer-common.c \ -- Evolution-DataServer-skels.c Evolution-DataServer-stubs.c \ -- Evolution-DataServer.h e-shell-nm.c e-shell-nm-glib.c \ -- e-component-registry.c e-component-registry.h \ -- e-config-upgrade.c e-config-upgrade.h e-corba-config-page.c \ -- e-corba-config-page.h e-history.c e-history.h e-shell.c \ -- e-shell.h e-shell-constants.h e-shell-folder-title-bar.c \ -- e-shell-folder-title-bar.h e-shell-importer.c \ -- e-shell-importer.h e-shell-settings-dialog.c \ -- e-shell-settings-dialog.h e-shell-window-commands.c \ -- e-shell-window-commands.h e-shell-window.c e-shell-window.h \ -- e-shell-view.c e-shell-view.h e-sidebar.c e-sidebar.h \ -- es-event.c es-menu.c main.c --am__objects_5 = Evolution-DataServer-common.$(OBJEXT) \ -- Evolution-DataServer-skels.$(OBJEXT) \ -- Evolution-DataServer-stubs.$(OBJEXT) --am__objects_6 = $(am__objects_5) $(am__objects_1) --@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@am__objects_7 = \ --@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@ e-shell-nm.$(OBJEXT) --@NM_SUPPORT_GLIB_TRUE@am__objects_7 = e-shell-nm-glib.$(OBJEXT) --am_evolution_OBJECTS = $(am__objects_6) $(am__objects_7) \ -- e-component-registry.$(OBJEXT) e-config-upgrade.$(OBJEXT) \ -- e-corba-config-page.$(OBJEXT) e-history.$(OBJEXT) \ -- e-shell.$(OBJEXT) e-shell-folder-title-bar.$(OBJEXT) \ -- e-shell-importer.$(OBJEXT) e-shell-settings-dialog.$(OBJEXT) \ -- e-shell-window-commands.$(OBJEXT) e-shell-window.$(OBJEXT) \ -- e-shell-view.$(OBJEXT) e-sidebar.$(OBJEXT) es-event.$(OBJEXT) \ -- es-menu.$(OBJEXT) main.$(OBJEXT) --evolution_OBJECTS = $(am_evolution_OBJECTS) --evolution_DEPENDENCIES = libeshell.la \ -- $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --SCRIPTS = $(noinst_SCRIPTS) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) \ -- $(evolution_SOURCES) --DIST_SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) \ -- $(am__evolution_SOURCES_DIST) --errorDATA_INSTALL = $(INSTALL_DATA) --gladeDATA_INSTALL = $(INSTALL_DATA) --idlDATA_INSTALL = $(INSTALL_DATA) --schemaDATA_INSTALL = $(INSTALL_DATA) --serverDATA_INSTALL = $(INSTALL_DATA) --testserverDATA_INSTALL = $(INSTALL_DATA) --DATA = $(error_DATA) $(glade_DATA) $(idl_DATA) $(schema_DATA) \ -- $(server_DATA) $(testserver_DATA) --eshellincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(eshellinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -191,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -202,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -227,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -252,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -260,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -318,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -342,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -366,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -374,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -381,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -390,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -412,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -442,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -461,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir)/widgets \ -@@ -490,6 +410,9 @@ - $(EVOLUTION_TEST_CFLAGS) - - -+noinst_PROGRAMS = evolution -+ -+ - # Shell CORBA stuff - IDLS = \ - Evolution-ConfigControl.idl \ -@@ -497,40 +420,51 @@ - Evolution-Shell.idl \ - Evolution.idl - -+ - IDL_GENERATED_H = \ - Evolution.h - -+ - IDL_GENERATED_C = \ - Evolution-common.c \ - Evolution-skels.c \ - Evolution-stubs.c - -+ - idl_defines = \ - -D__evolution_shell_COMPILATION - -+ - IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C) --@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@NM_SUPPORT_FILES = e-shell-nm.c -+ - @NM_SUPPORT_GLIB_TRUE@NM_SUPPORT_FILES = e-shell-nm-glib.c -+@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@NM_SUPPORT_FILES = e-shell-nm.c - - # Data Server CORBA stuff - DATASERVER_IDL_GENERATED_H = \ - Evolution-DataServer.h - -+ - DATASERVER_IDL_GENERATED_C = \ - Evolution-DataServer-common.c \ - Evolution-DataServer-skels.c \ - Evolution-DataServer-stubs.c - -+ - DATASERVER_IDL_GENERATED = $(DATASERVER_IDL_GENERATED_C) $(DATASERVER_IDL_GENERATED_H) - -+ - # IDL install - idl_DATA = $(IDLS) - -+ - # Shell library - privsolib_LTLIBRARIES = \ - libeshell.la - -+ - eshellincludedir = $(privincludedir)/shell -+ - eshellinclude_HEADERS = \ - Evolution.h \ - e-component-view.h \ -@@ -543,6 +477,7 @@ - es-event.h \ - es-menu.h - -+ - libeshell_la_SOURCES = \ - $(IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ -@@ -555,13 +490,16 @@ - evolution-shell-component-utils.c \ - $(eshellinclude_HEADERS) - -+ - libeshell_la_LDFLAGS = $(NO_UNDEFINED) -+ - libeshell_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(SHELL_LIBS) - - -+ - # Evolution executable - evolution_SOURCES = \ - $(DATASERVER_IDL_GENERATED) \ -@@ -595,6 +533,7 @@ - es-menu.c \ - main.c - -+ - evolution_LDADD = \ - libeshell.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -@@ -604,38 +543,49 @@ - $(SHELL_LIBS) - - -+ - # Test component - @ENABLE_TEST_COMPONENT_TRUE@component_LTLIBRARIES = libevolution-test.la -+ - libevolution_test_la_SOURCES = \ - $(IDL_GENERATED) \ - evolution-test-component.c \ - evolution-test-component.h - -+ - libevolution_test_la_LIBADD = \ - libeshell.la \ - $(EVOLUTION_TEST_LIBS) - -+ - libevolution_test_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) -+ - @ENABLE_TEST_COMPONENT_TRUE@testserver_in_files = GNOME_Evolution_Test.server.in.in - @ENABLE_TEST_COMPONENT_TRUE@testserver_DATA = $(testserver_in_files:.server.in.in=.server) - @ENABLE_TEST_COMPONENT_TRUE@testserverdir = $(serverdir) - -+ - # Misc stuff - server_in_files = GNOME_Evolution_Shell.server.in.in - server_DATA = $(server_in_files:.server.in.in=.server) -+ - error_DATA = shell.error - errordir = $(privdatadir)/errors -+ - glade_DATA = \ - e-active-connection-dialog.glade \ - import.glade - - -+ - # GConf schemas - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_in_files = apps_evolution_shell.schemas.in - schema_DATA = $(schema_in_files:.schemas.in=.schemas) -+ - MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h - -+ - # Extra dist stuff - EXTRA_DIST = \ - $(IDLS) \ -@@ -649,106 +599,203 @@ - evolution-nognome.in - - -+ - # Purify support - @ENABLE_PURIFY_TRUE@PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+ - BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) - CLEANFILES = $(BUILT_SOURCES) -+ - DISTCLEANFILES = $(schema_DATA) -+ - noinst_SCRIPTS = evolution-nognome -+subdir = shell -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = evolution-nognome -+LTLIBRARIES = $(component_LTLIBRARIES) $(privsolib_LTLIBRARIES) -+ -+libeshell_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la -+am__objects_1 = -+am__objects_2 = Evolution-common.lo Evolution-skels.lo \ -+ Evolution-stubs.lo -+am__objects_3 = $(am__objects_1) $(am__objects_2) -+am__objects_4 = e-shell-marshal.lo -+am_libeshell_la_OBJECTS = $(am__objects_3) $(am__objects_4) \ -+ e-component-view.lo evolution-component.lo \ -+ evolution-listener.lo e-shell-utils.lo \ -+ e-user-creatable-items-handler.lo evolution-config-control.lo \ -+ evolution-shell-component-utils.lo $(am__objects_1) -+libeshell_la_OBJECTS = $(am_libeshell_la_OBJECTS) -+libevolution_test_la_DEPENDENCIES = libeshell.la -+am_libevolution_test_la_OBJECTS = $(am__objects_3) \ -+ evolution-test-component.lo -+libevolution_test_la_OBJECTS = $(am_libevolution_test_la_OBJECTS) -+noinst_PROGRAMS = evolution$(EXEEXT) -+PROGRAMS = $(noinst_PROGRAMS) -+ -+am__evolution_SOURCES_DIST = Evolution-DataServer-common.c \ -+ Evolution-DataServer-skels.c Evolution-DataServer-stubs.c \ -+ Evolution-DataServer.h e-shell-nm-glib.c e-shell-nm.c \ -+ e-component-registry.c e-component-registry.h \ -+ e-config-upgrade.c e-config-upgrade.h e-corba-config-page.c \ -+ e-corba-config-page.h e-history.c e-history.h e-shell.c \ -+ e-shell.h e-shell-constants.h e-shell-folder-title-bar.c \ -+ e-shell-folder-title-bar.h e-shell-importer.c \ -+ e-shell-importer.h e-shell-settings-dialog.c \ -+ e-shell-settings-dialog.h e-shell-window-commands.c \ -+ e-shell-window-commands.h e-shell-window.c e-shell-window.h \ -+ e-shell-view.c e-shell-view.h e-sidebar.c e-sidebar.h \ -+ es-event.c es-menu.c main.c -+am__objects_5 = Evolution-DataServer-common.$(OBJEXT) \ -+ Evolution-DataServer-skels.$(OBJEXT) \ -+ Evolution-DataServer-stubs.$(OBJEXT) -+am__objects_6 = $(am__objects_5) $(am__objects_1) -+@NM_SUPPORT_GLIB_TRUE@am__objects_7 = e-shell-nm-glib.$(OBJEXT) -+@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@am__objects_7 = \ -+@NM_SUPPORT_GLIB_FALSE@@NM_SUPPORT_TRUE@ e-shell-nm.$(OBJEXT) -+am_evolution_OBJECTS = $(am__objects_6) $(am__objects_7) \ -+ e-component-registry.$(OBJEXT) e-config-upgrade.$(OBJEXT) \ -+ e-corba-config-page.$(OBJEXT) e-history.$(OBJEXT) \ -+ e-shell.$(OBJEXT) e-shell-folder-title-bar.$(OBJEXT) \ -+ e-shell-importer.$(OBJEXT) e-shell-settings-dialog.$(OBJEXT) \ -+ e-shell-window-commands.$(OBJEXT) e-shell-window.$(OBJEXT) \ -+ e-shell-view.$(OBJEXT) e-sidebar.$(OBJEXT) es-event.$(OBJEXT) \ -+ es-menu.$(OBJEXT) main.$(OBJEXT) -+evolution_OBJECTS = $(am_evolution_OBJECTS) -+evolution_DEPENDENCIES = libeshell.la \ -+ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+evolution_LDFLAGS = -+SCRIPTS = $(noinst_SCRIPTS) -+ -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/Evolution-DataServer-common.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-skels.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-DataServer-stubs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-common.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-skels.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/Evolution-stubs.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-component-registry.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-component-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-config-upgrade.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-corba-config-page.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-history.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-folder-title-bar.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-importer.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-marshal.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-nm-glib.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-nm.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-settings-dialog.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-view.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-window-commands.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell-window.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-shell.Po ./$(DEPDIR)/e-sidebar.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-user-creatable-items-handler.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/es-event.Po ./$(DEPDIR)/es-menu.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-config-control.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-listener.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-shell-component-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/evolution-test-component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/main.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) \ -+ $(am__evolution_SOURCES_DIST) -+DATA = $(error_DATA) $(glade_DATA) $(idl_DATA) $(schema_DATA) \ -+ $(server_DATA) $(testserver_DATA) -+ -+HEADERS = $(eshellinclude_HEADERS) -+ -+DIST_COMMON = $(eshellinclude_HEADERS) $(srcdir)/Makefile.in ChangeLog \ -+ Makefile.am evolution-nognome.in -+SOURCES = $(libeshell_la_SOURCES) $(libevolution_test_la_SOURCES) $(evolution_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu shell/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu shell/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --evolution-nognome: $(top_builddir)/config.status $(srcdir)/evolution-nognome.in -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+evolution-nognome: $(top_builddir)/config.status evolution-nognome.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+componentLTLIBRARIES_INSTALL = $(INSTALL) - install-componentLTLIBRARIES: $(component_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(componentdir)" || $(MKDIR_P) "$(DESTDIR)$(componentdir)" -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(componentdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(componentdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(componentLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(componentdir)/$$f; \ - else :; fi; \ - done - - uninstall-componentLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(componentdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(componentdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(componentdir)/$$p; \ - done - - clean-componentLTLIBRARIES: - -test -z "$(component_LTLIBRARIES)" || rm -f $(component_LTLIBRARIES) - @list='$(component_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libeshell.la: $(libeshell_la_OBJECTS) $(libeshell_la_DEPENDENCIES) -- $(libeshell_la_LINK) -rpath $(privsolibdir) $(libeshell_la_OBJECTS) $(libeshell_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libeshell_la_LDFLAGS) $(libeshell_la_OBJECTS) $(libeshell_la_LIBADD) $(LIBS) - libevolution-test.la: $(libevolution_test_la_OBJECTS) $(libevolution_test_la_DEPENDENCIES) -- $(libevolution_test_la_LINK) $(am_libevolution_test_la_rpath) $(libevolution_test_la_OBJECTS) $(libevolution_test_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(componentdir) $(libevolution_test_la_LDFLAGS) $(libevolution_test_la_OBJECTS) $(libevolution_test_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -758,10 +805,10 @@ - done - evolution$(EXEEXT): $(evolution_OBJECTS) $(evolution_DEPENDENCIES) - @rm -f evolution$(EXEEXT) -- $(LINK) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS) -+ $(LINK) $(evolution_LDFLAGS) $(evolution_OBJECTS) $(evolution_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -800,151 +847,182 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+errorDATA_INSTALL = $(INSTALL_DATA) - install-errorDATA: $(error_DATA) - @$(NORMAL_INSTALL) -- test -z "$(errordir)" || $(MKDIR_P) "$(DESTDIR)$(errordir)" -+ $(mkinstalldirs) $(DESTDIR)$(errordir) - @list='$(error_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(errorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(errordir)/$$f'"; \ -- $(errorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f"; \ -+ $(errorDATA_INSTALL) $$d$$p $(DESTDIR)$(errordir)/$$f; \ - done - - uninstall-errorDATA: - @$(NORMAL_UNINSTALL) - @list='$(error_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(errordir)/$$f'"; \ -- rm -f "$(DESTDIR)$(errordir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(errordir)/$$f"; \ -+ rm -f $(DESTDIR)$(errordir)/$$f; \ - done -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+idlDATA_INSTALL = $(INSTALL_DATA) - install-idlDATA: $(idl_DATA) - @$(NORMAL_INSTALL) -- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" -+ $(mkinstalldirs) $(DESTDIR)$(idldir) - @list='$(idl_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ -- $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f"; \ -+ $(idlDATA_INSTALL) $$d$$p $(DESTDIR)$(idldir)/$$f; \ - done - - uninstall-idlDATA: - @$(NORMAL_UNINSTALL) - @list='$(idl_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ -- rm -f "$(DESTDIR)$(idldir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ -+ rm -f $(DESTDIR)$(idldir)/$$f; \ - done -+schemaDATA_INSTALL = $(INSTALL_DATA) - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" -+ $(mkinstalldirs) $(DESTDIR)$(schemadir) - @list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ -- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ -+ $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ - done - - uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(schemadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ -+ rm -f $(DESTDIR)$(schemadir)/$$f; \ - done -+serverDATA_INSTALL = $(INSTALL_DATA) - install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) -- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" -+ $(mkinstalldirs) $(DESTDIR)$(serverdir) - @list='$(server_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ -- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ -+ $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ - done - - uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(serverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ -+ rm -f $(DESTDIR)$(serverdir)/$$f; \ - done -+testserverDATA_INSTALL = $(INSTALL_DATA) - install-testserverDATA: $(testserver_DATA) - @$(NORMAL_INSTALL) -- test -z "$(testserverdir)" || $(MKDIR_P) "$(DESTDIR)$(testserverdir)" -+ $(mkinstalldirs) $(DESTDIR)$(testserverdir) - @list='$(testserver_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(testserverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(testserverdir)/$$f'"; \ -- $(testserverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(testserverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(testserverDATA_INSTALL) $$d$$p $(DESTDIR)$(testserverdir)/$$f"; \ -+ $(testserverDATA_INSTALL) $$d$$p $(DESTDIR)$(testserverdir)/$$f; \ - done - - uninstall-testserverDATA: - @$(NORMAL_UNINSTALL) - @list='$(testserver_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(testserverdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(testserverdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(testserverdir)/$$f"; \ -+ rm -f $(DESTDIR)$(testserverdir)/$$f; \ - done -+eshellincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-eshellincludeHEADERS: $(eshellinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(eshellincludedir)" || $(MKDIR_P) "$(DESTDIR)$(eshellincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(eshellincludedir) - @list='$(eshellinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(eshellincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(eshellincludedir)/$$f'"; \ -- $(eshellincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(eshellincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(eshellincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eshellincludedir)/$$f"; \ -+ $(eshellincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(eshellincludedir)/$$f; \ - done - - uninstall-eshellincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(eshellinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(eshellincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(eshellincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(eshellincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(eshellincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -953,7 +1031,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -965,11 +1042,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -992,23 +1068,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -1025,13 +1106,11 @@ - check-am: all-am - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am --@ENABLE_PURIFY_FALSE@all-local: - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ - $(HEADERS) all-local -+ - installdirs: -- for dir in "$(DESTDIR)$(componentdir)" "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(errordir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(testserverdir)" "$(DESTDIR)$(eshellincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(componentdir) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(errordir) $(DESTDIR)$(gladedir) $(DESTDIR)$(idldir) $(DESTDIR)$(schemadir) $(DESTDIR)$(serverdir) $(DESTDIR)$(testserverdir) $(DESTDIR)$(eshellincludedir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -1053,7 +1132,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -1069,14 +1148,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -1086,20 +1163,12 @@ - install-gladeDATA install-idlDATA install-privsolibLTLIBRARIES \ - install-schemaDATA install-serverDATA install-testserverDATA - --install-dvi: install-dvi-am -- - install-exec-am: install-exec-local - --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 -@@ -1122,35 +1191,31 @@ - - uninstall-am: uninstall-componentLTLIBRARIES uninstall-errorDATA \ - uninstall-eshellincludeHEADERS uninstall-gladeDATA \ -- uninstall-idlDATA uninstall-local \ -+ uninstall-idlDATA uninstall-info-am uninstall-local \ - uninstall-privsolibLTLIBRARIES uninstall-schemaDATA \ - uninstall-serverDATA uninstall-testserverDATA - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-componentLTLIBRARIES clean-generic clean-libtool \ -- clean-noinstPROGRAMS clean-privsolibLTLIBRARIES ctags \ -- dist-hook distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am \ -- install-componentLTLIBRARIES install-data install-data-am \ -- install-data-local install-dvi install-dvi-am \ -- install-errorDATA install-eshellincludeHEADERS install-exec \ -- install-exec-am install-exec-local install-gladeDATA \ -- install-html install-html-am install-idlDATA install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -- install-schemaDATA install-serverDATA install-strip \ -- install-testserverDATA 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-componentLTLIBRARIES \ -+ clean-noinstPROGRAMS clean-privsolibLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-componentLTLIBRARIES install-data \ -+ install-data-am install-data-local install-errorDATA \ -+ install-eshellincludeHEADERS install-exec install-exec-am \ -+ install-exec-local install-gladeDATA install-idlDATA \ -+ install-info install-info-am install-man \ -+ install-privsolibLTLIBRARIES install-schemaDATA \ -+ install-serverDATA install-strip install-testserverDATA \ -+ 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-componentLTLIBRARIES \ - uninstall-errorDATA uninstall-eshellincludeHEADERS \ -- uninstall-gladeDATA uninstall-idlDATA uninstall-local \ -- uninstall-privsolibLTLIBRARIES uninstall-schemaDATA \ -- uninstall-serverDATA uninstall-testserverDATA -+ uninstall-gladeDATA uninstall-idlDATA uninstall-info-am \ -+ uninstall-local uninstall-privsolibLTLIBRARIES \ -+ uninstall-schemaDATA uninstall-serverDATA \ -+ uninstall-testserverDATA - - - $(IDL_GENERATED_H): $(IDLS) -diff -ruN evolution-2.12.2.orig/smime/gui/Makefile.in evolution-2.12.2/smime/gui/Makefile.in ---- evolution-2.12.2.orig/smime/gui/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/smime/gui/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,62 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = smime/gui --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libevolution_smime_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/shell/libeshell.la \ -- $(top_builddir)/smime/lib/libessmime.la $(am__DEPENDENCIES_1) --am_libevolution_smime_la_OBJECTS = ca-trust-dialog.lo \ -- cert-trust-dialog.lo certificate-manager.lo \ -- certificate-viewer.lo e-cert-selector.lo component.lo --libevolution_smime_la_OBJECTS = $(am_libevolution_smime_la_OBJECTS) --libevolution_smime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libevolution_smime_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libevolution_smime_la_SOURCES) --DIST_SOURCES = $(libevolution_smime_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -120,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -131,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -156,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -181,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -189,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -247,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -271,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -295,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -303,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -310,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -319,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -341,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -371,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -390,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-smime\" \ -@@ -414,7 +405,9 @@ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(CERT_UI_CFLAGS) - -+ - privsolib_LTLIBRARIES = libevolution-smime.la -+ - libevolution_smime_la_SOURCES = \ - ca-trust-dialog.c \ - ca-trust-dialog.h \ -@@ -429,82 +422,100 @@ - component.c \ - component.h - -+ - libevolution_smime_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/smime/lib/libessmime.la \ - $(CERT_UI_LIBS) - -+ - libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) -+ - glade_DATA = smime-ui.glade -+ - EXTRA_DIST = \ - $(glade_DATA) - -+subdir = smime/gui -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libevolution_smime_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/shell/libeshell.la \ -+ $(top_builddir)/smime/lib/libessmime.la -+am_libevolution_smime_la_OBJECTS = ca-trust-dialog.lo \ -+ cert-trust-dialog.lo certificate-manager.lo \ -+ certificate-viewer.lo e-cert-selector.lo component.lo -+libevolution_smime_la_OBJECTS = $(am_libevolution_smime_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ca-trust-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cert-trust-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/certificate-manager.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/certificate-viewer.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/component.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cert-selector.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libevolution_smime_la_SOURCES) -+DATA = $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libevolution_smime_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu smime/gui/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu smime/gui/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libevolution-smime.la: $(libevolution_smime_la_OBJECTS) $(libevolution_smime_la_DEPENDENCIES) -- $(libevolution_smime_la_LINK) -rpath $(privsolibdir) $(libevolution_smime_la_OBJECTS) $(libevolution_smime_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libevolution_smime_la_LDFLAGS) $(libevolution_smime_la_OBJECTS) $(libevolution_smime_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -517,49 +528,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-cert-selector.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -568,7 +604,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -580,11 +615,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -607,23 +641,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -637,10 +676,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -660,7 +698,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -674,34 +712,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-gladeDATA install-privsolibLTLIBRARIES - --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 -@@ -722,24 +750,21 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -- 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-gladeDATA uninstall-privsolibLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-man install-privsolibLTLIBRARIES 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-gladeDATA \ -+ uninstall-info-am uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/smime/lib/Makefile.in evolution-2.12.2/smime/lib/Makefile.in ---- evolution-2.12.2.orig/smime/lib/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/smime/lib/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,58 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = smime/lib --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libessmime_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(am__DEPENDENCIES_1) --am__objects_1 = smime-marshal.lo --am_libessmime_la_OBJECTS = $(am__objects_1) e-asn1-object.lo e-cert.lo \ -- e-cert-trust.lo e-cert-db.lo e-pkcs12.lo --libessmime_la_OBJECTS = $(am_libessmime_la_OBJECTS) --libessmime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libessmime_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libessmime_la_SOURCES) --DIST_SOURCES = $(libessmime_la_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -115,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -126,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -151,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -176,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -184,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -242,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -266,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -298,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -305,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -314,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -336,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -366,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -385,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-smime\" \ -@@ -406,7 +402,9 @@ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(CERT_UI_CFLAGS) - -+ - privsolib_LTLIBRARIES = libessmime.la -+ - libessmime_la_SOURCES = \ - $(MARSHAL_GENERATED) \ - e-asn1-object.c \ -@@ -420,81 +418,95 @@ - e-pkcs12.c \ - e-pkcs12.h - -+ - libessmime_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(CERT_UI_LIBS) - -+ - libessmime_la_LDFLAGS = $(NO_UNDEFINED) -+ - MARSHAL_GENERATED = smime-marshal.c smime-marshal.h -+ - BUILT_SOURCES = $(MARSHAL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) -+ - EXTRA_DIST = smime-marshal.list -+subdir = smime/lib -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libessmime_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la -+am__objects_1 = smime-marshal.lo -+am_libessmime_la_OBJECTS = $(am__objects_1) e-asn1-object.lo e-cert.lo \ -+ e-cert-trust.lo e-cert-db.lo e-pkcs12.lo -+libessmime_la_OBJECTS = $(am_libessmime_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-asn1-object.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cert-db.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cert-trust.Plo ./$(DEPDIR)/e-cert.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-pkcs12.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/smime-marshal.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libessmime_la_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libessmime_la_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu smime/lib/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu smime/lib/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libessmime.la: $(libessmime_la_OBJECTS) $(libessmime_la_DEPENDENCIES) -- $(libessmime_la_LINK) -rpath $(privsolibdir) $(libessmime_la_OBJECTS) $(libessmime_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libessmime_la_LDFLAGS) $(libessmime_la_OBJECTS) $(libessmime_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -507,25 +519,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime-marshal.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -533,6 +557,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -541,7 +577,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -553,11 +588,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -580,23 +614,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -611,10 +650,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -636,7 +674,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -651,34 +689,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-privsolibLTLIBRARIES - --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 -@@ -699,23 +727,20 @@ - - ps-am: - --uninstall-am: uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privsolibLTLIBRARIES 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-privsolibLTLIBRARIES -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - @EVO_MARSHAL_RULE@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -ruN evolution-2.12.2.orig/smime/Makefile.in evolution-2.12.2/smime/Makefile.in ---- evolution-2.12.2.orig/smime/Makefile.in 2007-12-05 15:50:06.000000000 +0100 -+++ evolution-2.12.2/smime/Makefile.in 2007-12-05 15:55:02.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = smime --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,45 +384,32 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = lib gui -+subdir = smime -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu smime/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu smime/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,6 +417,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, -@@ -416,13 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -434,20 +440,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -468,7 +469,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -479,6 +480,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -487,22 +496,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -512,11 +518,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -539,23 +544,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -566,19 +576,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -588,6 +594,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -607,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -618,34 +625,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -664,24 +662,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/tools/Makefile.in evolution-2.12.2/tools/Makefile.in ---- evolution-2.12.2.orig/tools/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/tools/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,49 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --privlibexec_PROGRAMS = $(am__EXEEXT_1) --subdir = tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --@OS_WIN32_FALSE@am__EXEEXT_1 = killev$(EXEEXT) --am__installdirs = "$(DESTDIR)$(privlibexecdir)" --privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --PROGRAMS = $(privlibexec_PROGRAMS) --am_killev_OBJECTS = killev.$(OBJEXT) --killev_OBJECTS = $(am_killev_OBJECTS) --am__DEPENDENCIES_1 = --killev_DEPENDENCIES = $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(killev_SOURCES) --DIST_SOURCES = $(killev_SOURCES) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -106,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -117,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -142,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -167,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -175,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -233,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -257,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -281,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -289,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -296,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -305,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -327,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -357,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -376,15 +384,17 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_FALSE@PLATFORM_DEP_TOOLS = \ - @OS_WIN32_FALSE@ killev - -+ -+privlibexec_PROGRAMS = \ -+ $(PLATFORM_DEP_TOOLS) -+ -+ - INCLUDES = \ - -DG_LOG_DOMAIN=\"evolution-tools\" \ - -I$(top_srcdir) \ -@@ -396,71 +406,85 @@ - -DLIBDIR=\""$(libdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) - -+ - EXTRA_DIST = verify-evolution-install.sh -+ - CORBA_SOURCE = \ - Evolution-Composer.h \ - Evolution-Composer-common.c \ - Evolution-Composer-skels.c \ - Evolution-Composer-stubs.c - -+ - BUILT_SOURCES = $(CORBA_SOURCE) -+ - idls = \ - $(top_srcdir)/composer/Evolution-Composer.idl - -+ - killev_SOURCES = \ - killev.c - -+ - killev_LDADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) - -+ - CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES) -+subdir = tools -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+@OS_WIN32_TRUE@privlibexec_PROGRAMS = -+@OS_WIN32_FALSE@privlibexec_PROGRAMS = killev$(EXEEXT) -+PROGRAMS = $(privlibexec_PROGRAMS) -+ -+am_killev_OBJECTS = killev.$(OBJEXT) -+killev_OBJECTS = $(am_killev_OBJECTS) -+killev_DEPENDENCIES = $(top_builddir)/widgets/misc/libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+killev_LDFLAGS = -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/killev.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(killev_SOURCES) -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(killev_SOURCES) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privlibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-privlibexecPROGRAMS: $(privlibexec_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(privlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibexecdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(privlibexecdir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(privlibexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(privlibexecdir)/$$f || exit 1; \ - else :; fi; \ - done - -@@ -468,8 +492,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(privlibexec_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f '$(DESTDIR)$(privlibexecdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(privlibexecdir)/$$f"; \ -+ echo " rm -f $(DESTDIR)$(privlibexecdir)/$$f"; \ -+ rm -f $(DESTDIR)$(privlibexecdir)/$$f; \ - done - - clean-privlibexecPROGRAMS: -@@ -480,10 +504,10 @@ - done - killev$(EXEEXT): $(killev_OBJECTS) $(killev_DEPENDENCIES) - @rm -f killev$(EXEEXT) -- $(LINK) $(killev_OBJECTS) $(killev_LDADD) $(LIBS) -+ $(LINK) $(killev_LDFLAGS) $(killev_OBJECTS) $(killev_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -491,25 +515,37 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/killev.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -517,6 +553,18 @@ - clean-libtool: - -rm -rf .libs _libs - -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -525,7 +573,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -537,11 +584,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -564,23 +610,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -595,10 +646,9 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(PROGRAMS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privlibexecdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privlibexecdir) - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -620,7 +670,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -635,34 +685,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: - --install-dvi: install-dvi-am -- - install-exec-am: install-privlibexecPROGRAMS - --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 -@@ -683,23 +723,20 @@ - - ps-am: - --uninstall-am: uninstall-privlibexecPROGRAMS -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-privlibexecPROGRAMS - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privlibexecPROGRAMS 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-privlibexecPROGRAMS \ -- install-ps install-ps-am install-strip installcheck \ -+ distclean-tags distdir dvi dvi-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-privlibexecPROGRAMS 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-privlibexecPROGRAMS -+ tags uninstall uninstall-am uninstall-info-am \ -+ uninstall-privlibexecPROGRAMS - - - $(CORBA_SOURCE): $(idls) -diff -ruN evolution-2.12.2.orig/ui/Makefile.in evolution-2.12.2/ui/Makefile.in ---- evolution-2.12.2.orig/ui/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/ui/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = ui --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(evolutionuidir)" --evolutionuiDATA_INSTALL = $(INSTALL_DATA) --DATA = $(evolutionui_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - XML_FILES = \ - evolution.xml \ -@@ -386,65 +406,57 @@ - evolution-editor.xml \ - evolution-tasks.xml - -+ - evolutionui_DATA = $(XML_FILES) -+ - EXTRA_DIST = \ - $(XML_FILES) \ - ChangeLog.pre-1-4 - -+subdir = ui -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(evolutionui_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ui/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu ui/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+evolutionuiDATA_INSTALL = $(INSTALL_DATA) - install-evolutionuiDATA: $(evolutionui_DATA) - @$(NORMAL_INSTALL) -- test -z "$(evolutionuidir)" || $(MKDIR_P) "$(DESTDIR)$(evolutionuidir)" -+ $(mkinstalldirs) $(DESTDIR)$(evolutionuidir) - @list='$(evolutionui_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(evolutionuiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(evolutionuidir)/$$f'"; \ -- $(evolutionuiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(evolutionuidir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(evolutionuiDATA_INSTALL) $$d$$p $(DESTDIR)$(evolutionuidir)/$$f"; \ -+ $(evolutionuiDATA_INSTALL) $$d$$p $(DESTDIR)$(evolutionuidir)/$$f; \ - done - - uninstall-evolutionuiDATA: - @$(NORMAL_UNINSTALL) - @list='$(evolutionui_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(evolutionuidir)/$$f'"; \ -- rm -f "$(DESTDIR)$(evolutionuidir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(evolutionuidir)/$$f"; \ -+ rm -f $(DESTDIR)$(evolutionuidir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -452,23 +464,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -482,10 +499,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(evolutionuidir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(evolutionuidir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -505,7 +521,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -516,34 +532,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-evolutionuiDATA - --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 -@@ -562,21 +568,18 @@ - - ps-am: - --uninstall-am: uninstall-evolutionuiDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-evolutionuiDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-evolutionuiDATA install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-evolutionuiDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-evolutionuiDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-evolutionuiDATA \ -+ 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 -ruN evolution-2.12.2.orig/views/addressbook/Makefile.in evolution-2.12.2/views/addressbook/Makefile.in ---- evolution-2.12.2.orig/views/addressbook/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/views/addressbook/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = views/addressbook --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(addressviewsdir)" --addressviewsDATA_INSTALL = $(INSTALL_DATA) --DATA = $(addressviews_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,69 +384,56 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - addressviewsdir = $(viewsdir)/addressbook - addressviews_DATA = Address_Cards.galview By_Company.galview Phone_List.galview galview.xml - EXTRA_DIST = $(addressviews_DATA) -+subdir = views/addressbook -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(addressviews_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/addressbook/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu views/addressbook/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+addressviewsDATA_INSTALL = $(INSTALL_DATA) - install-addressviewsDATA: $(addressviews_DATA) - @$(NORMAL_INSTALL) -- test -z "$(addressviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(addressviewsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(addressviewsdir) - @list='$(addressviews_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(addressviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addressviewsdir)/$$f'"; \ -- $(addressviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addressviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(addressviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(addressviewsdir)/$$f"; \ -+ $(addressviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(addressviewsdir)/$$f; \ - done - - uninstall-addressviewsDATA: - @$(NORMAL_UNINSTALL) - @list='$(addressviews_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(addressviewsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(addressviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(addressviewsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(addressviewsdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -431,23 +441,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +476,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(addressviewsdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(addressviewsdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -484,7 +498,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -495,34 +509,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-addressviewsDATA - --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 -@@ -541,22 +545,17 @@ - - ps-am: - --uninstall-am: uninstall-addressviewsDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-addressviewsDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install \ -- install-addressviewsDATA 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 \ -- installcheck-am installdirs maintainer-clean \ -+ dvi-am info info-am install install-addressviewsDATA 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-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall \ -- uninstall-addressviewsDATA uninstall-am -+ uninstall-addressviewsDATA 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 -ruN evolution-2.12.2.orig/views/calendar/Makefile.in evolution-2.12.2/views/calendar/Makefile.in ---- evolution-2.12.2.orig/views/calendar/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/views/calendar/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = views/calendar --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(calendarviewsdir)" --calendarviewsDATA_INSTALL = $(INSTALL_DATA) --DATA = $(calendarviews_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,69 +384,58 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - calendarviewsdir = $(viewsdir)/calendar -+ - calendarviews_DATA = List_View.galview galview.xml -+ - EXTRA_DIST = $(calendarviews_DATA) -+subdir = views/calendar -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(calendarviews_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/calendar/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu views/calendar/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+calendarviewsDATA_INSTALL = $(INSTALL_DATA) - install-calendarviewsDATA: $(calendarviews_DATA) - @$(NORMAL_INSTALL) -- test -z "$(calendarviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(calendarviewsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(calendarviewsdir) - @list='$(calendarviews_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(calendarviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(calendarviewsdir)/$$f'"; \ -- $(calendarviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(calendarviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(calendarviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(calendarviewsdir)/$$f"; \ -+ $(calendarviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(calendarviewsdir)/$$f; \ - done - - uninstall-calendarviewsDATA: - @$(NORMAL_UNINSTALL) - @list='$(calendarviews_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(calendarviewsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(calendarviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(calendarviewsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(calendarviewsdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -431,23 +443,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +478,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(calendarviewsdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(calendarviewsdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -484,7 +500,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -495,34 +511,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-calendarviewsDATA - --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 -@@ -541,21 +547,18 @@ - - ps-am: - --uninstall-am: uninstall-calendarviewsDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-calendarviewsDATA uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -+ dvi-am info info-am install install-am \ - install-calendarviewsDATA install-data install-data-am \ -- install-dvi install-dvi-am install-exec install-exec-am \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -+ 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-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-calendarviewsDATA -+ ps ps-am uninstall uninstall-am uninstall-calendarviewsDATA \ -+ 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 -ruN evolution-2.12.2.orig/views/mail/Makefile.in evolution-2.12.2/views/mail/Makefile.in ---- evolution-2.12.2.orig/views/mail/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/views/mail/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = views/mail --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(mailviewsdir)" --mailviewsDATA_INSTALL = $(INSTALL_DATA) --DATA = $(mailviews_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,69 +384,56 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - mailviewsdir = $(viewsdir)/mail - mailviews_DATA = As_Sent_Folder.galview By_Sender.galview By_Status.galview By_Subject.galview Messages.galview By_Follow_Up_Flag.galview galview.xml Wide_View_Normal.galview Wide_View_Sent.galview - EXTRA_DIST = $(mailviews_DATA) -+subdir = views/mail -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(mailviews_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/mail/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu views/mail/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+mailviewsDATA_INSTALL = $(INSTALL_DATA) - install-mailviewsDATA: $(mailviews_DATA) - @$(NORMAL_INSTALL) -- test -z "$(mailviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(mailviewsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(mailviewsdir) - @list='$(mailviews_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(mailviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mailviewsdir)/$$f'"; \ -- $(mailviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mailviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(mailviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(mailviewsdir)/$$f"; \ -+ $(mailviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(mailviewsdir)/$$f; \ - done - - uninstall-mailviewsDATA: - @$(NORMAL_UNINSTALL) - @list='$(mailviews_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(mailviewsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(mailviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(mailviewsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(mailviewsdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -431,23 +441,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +476,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(mailviewsdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(mailviewsdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -484,7 +498,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -495,34 +509,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-mailviewsDATA - --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 -@@ -541,21 +545,17 @@ - - ps-am: - --uninstall-am: uninstall-mailviewsDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-mailviewsDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-mailviewsDATA install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-mailviewsDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-info \ -+ install-info-am install-mailviewsDATA install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-mailviewsDATA - - # 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 -ruN evolution-2.12.2.orig/views/Makefile.in evolution-2.12.2/views/Makefile.in ---- evolution-2.12.2.orig/views/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/views/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = views --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,46 +384,34 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - SUBDIRS = addressbook mail tasks calendar memos -+ - EXTRA_DIST = ChangeLog.pre-1-4 -+subdir = views -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu views/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -410,6 +419,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, -@@ -417,13 +430,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -435,20 +442,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -469,7 +471,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -480,6 +482,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -488,22 +498,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -513,11 +520,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -540,23 +546,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -567,19 +578,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -589,6 +596,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -608,7 +616,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -619,34 +627,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -665,24 +664,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/views/memos/Makefile.in evolution-2.12.2/views/memos/Makefile.in ---- evolution-2.12.2.orig/views/memos/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/views/memos/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = views/memos --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(memosviewsdir)" --memosviewsDATA_INSTALL = $(INSTALL_DATA) --DATA = $(memosviews_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,69 +384,56 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - memosviewsdir = $(viewsdir)/memos - memosviews_DATA = Memos.galview galview.xml - EXTRA_DIST = $(memosviews_DATA) -+subdir = views/memos -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(memosviews_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/memos/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu views/memos/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+memosviewsDATA_INSTALL = $(INSTALL_DATA) - install-memosviewsDATA: $(memosviews_DATA) - @$(NORMAL_INSTALL) -- test -z "$(memosviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(memosviewsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(memosviewsdir) - @list='$(memosviews_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(memosviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(memosviewsdir)/$$f'"; \ -- $(memosviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(memosviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(memosviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(memosviewsdir)/$$f"; \ -+ $(memosviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(memosviewsdir)/$$f; \ - done - - uninstall-memosviewsDATA: - @$(NORMAL_UNINSTALL) - @list='$(memosviews_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(memosviewsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(memosviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(memosviewsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(memosviewsdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -431,23 +441,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +476,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(memosviewsdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(memosviewsdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -484,7 +498,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -495,34 +509,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-memosviewsDATA - --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 -@@ -541,21 +545,18 @@ - - ps-am: - --uninstall-am: uninstall-memosviewsDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-memosviewsDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man \ -- install-memosviewsDATA install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-memosviewsDATA -+ dvi-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-memosviewsDATA \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-memosviewsDATA - - # 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 -ruN evolution-2.12.2.orig/views/tasks/Makefile.in evolution-2.12.2/views/tasks/Makefile.in ---- evolution-2.12.2.orig/views/tasks/Makefile.in 2007-12-05 15:49:59.000000000 +0100 -+++ evolution-2.12.2/views/tasks/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,34 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = views/tasks --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(tasksviewsdir)" --tasksviewsDATA_INSTALL = $(INSTALL_DATA) --DATA = $(tasksviews_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -91,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -102,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -127,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -152,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -160,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -218,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -242,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -266,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -274,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -281,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -290,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -312,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -342,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -361,69 +384,56 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - tasksviewsdir = $(viewsdir)/tasks - tasksviews_DATA = Tasks.galview With_DueDate.galview With_Status.galview galview.xml - EXTRA_DIST = $(tasksviews_DATA) -+subdir = views/tasks -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(tasksviews_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu views/tasks/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu views/tasks/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+tasksviewsDATA_INSTALL = $(INSTALL_DATA) - install-tasksviewsDATA: $(tasksviews_DATA) - @$(NORMAL_INSTALL) -- test -z "$(tasksviewsdir)" || $(MKDIR_P) "$(DESTDIR)$(tasksviewsdir)" -+ $(mkinstalldirs) $(DESTDIR)$(tasksviewsdir) - @list='$(tasksviews_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(tasksviewsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tasksviewsdir)/$$f'"; \ -- $(tasksviewsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tasksviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(tasksviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(tasksviewsdir)/$$f"; \ -+ $(tasksviewsDATA_INSTALL) $$d$$p $(DESTDIR)$(tasksviewsdir)/$$f; \ - done - - uninstall-tasksviewsDATA: - @$(NORMAL_UNINSTALL) - @list='$(tasksviews_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(tasksviewsdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(tasksviewsdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(tasksviewsdir)/$$f"; \ -+ rm -f $(DESTDIR)$(tasksviewsdir)/$$f; \ - done - tags: TAGS - TAGS: -@@ -431,23 +441,28 @@ - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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,10 +476,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(tasksviewsdir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(tasksviewsdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -484,7 +498,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -495,34 +509,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-tasksviewsDATA - --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 -@@ -541,21 +545,18 @@ - - ps-am: - --uninstall-am: uninstall-tasksviewsDATA -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am uninstall-tasksviewsDATA - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-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-tasksviewsDATA installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am uninstall uninstall-am uninstall-tasksviewsDATA -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-info \ -+ install-info-am install-man install-strip \ -+ install-tasksviewsDATA installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-tasksviewsDATA - - # 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 -ruN evolution-2.12.2.orig/widgets/e-timezone-dialog/Makefile.in evolution-2.12.2/widgets/e-timezone-dialog/Makefile.in ---- evolution-2.12.2.orig/widgets/e-timezone-dialog/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/widgets/e-timezone-dialog/Makefile.in 2007-12-05 15:55:04.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,60 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = widgets/e-timezone-dialog --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libetimezonedialog_la_DEPENDENCIES = \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(am__DEPENDENCIES_1) --am_libetimezonedialog_la_OBJECTS = e-timezone-dialog.lo --libetimezonedialog_la_OBJECTS = $(am_libetimezonedialog_la_OBJECTS) --libetimezonedialog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libetimezonedialog_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libetimezonedialog_la_SOURCES) --DIST_SOURCES = $(libetimezonedialog_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -118,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -129,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -154,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -179,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -187,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -245,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -269,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -301,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -308,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -317,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -339,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -369,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -388,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - INCLUDES = \ - -I$(top_srcdir) \ -@@ -401,86 +394,98 @@ - -DG_LOG_DOMAIN=__FILE__ \ - $(TZDIALOG_CFLAGS) - -+ - privsolib_LTLIBRARIES = \ - libetimezonedialog.la - -+ - libetimezonedialog_la_SOURCES = \ - e-timezone-dialog.c \ - e-timezone-dialog.h - -+ - libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) -+ - libetimezonedialog_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) - -+ - glade_DATA = e-timezone-dialog.glade -+ - EXTRA_DIST = $(glade_DATA) -+subdir = widgets/e-timezone-dialog -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libetimezonedialog_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la -+am_libetimezonedialog_la_OBJECTS = e-timezone-dialog.lo -+libetimezonedialog_la_OBJECTS = $(am_libetimezonedialog_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-timezone-dialog.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libetimezonedialog_la_SOURCES) -+DATA = $(glade_DATA) -+ -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -+SOURCES = $(libetimezonedialog_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/e-timezone-dialog/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu widgets/e-timezone-dialog/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libetimezonedialog.la: $(libetimezonedialog_la_OBJECTS) $(libetimezonedialog_la_DEPENDENCIES) -- $(libetimezonedialog_la_LINK) -rpath $(privsolibdir) $(libetimezonedialog_la_OBJECTS) $(libetimezonedialog_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libetimezonedialog_la_LDFLAGS) $(libetimezonedialog_la_OBJECTS) $(libetimezonedialog_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -488,49 +493,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-timezone-dialog.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -539,7 +569,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -551,11 +580,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -578,23 +606,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -608,10 +641,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -631,7 +663,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -645,34 +677,24 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: install-gladeDATA install-privsolibLTLIBRARIES - --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 -@@ -693,24 +715,21 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am \ -- install-privsolibLTLIBRARIES install-ps install-ps-am \ -- 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-gladeDATA uninstall-privsolibLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-man install-privsolibLTLIBRARIES 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-gladeDATA \ -+ uninstall-info-am uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/widgets/Makefile.in evolution-2.12.2/widgets/Makefile.in ---- evolution-2.12.2.orig/widgets/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/widgets/Makefile.in 2007-12-05 15:55:03.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,17 @@ - # 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 -@@ -29,37 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = widgets --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --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 --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -93,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -104,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -129,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -154,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -162,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -220,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -244,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -268,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -276,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -283,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -292,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -314,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -344,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -363,12 +384,10 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ -+ - SUBDIRS = \ - table \ - text \ -@@ -376,41 +395,32 @@ - e-timezone-dialog \ - menus - -+ - EXTRA_DIST = \ - ChangeLog.pre-1-4 - -+subdir = widgets -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am -+DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu widgets/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo -@@ -418,6 +428,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, -@@ -425,13 +439,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -443,20 +451,15 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -477,7 +480,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -488,6 +491,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -496,22 +507,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -521,11 +529,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -548,23 +555,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -575,19 +587,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -597,6 +605,7 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -616,7 +625,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -627,34 +636,25 @@ - - 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 - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: - --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -673,24 +673,26 @@ - - 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 \ -- 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 \ -- 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 -+.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 \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-recursive install-strip installcheck installcheck-am \ -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-recursive - - # 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 -ruN evolution-2.12.2.orig/widgets/menus/Makefile.in evolution-2.12.2/widgets/menus/Makefile.in ---- evolution-2.12.2.orig/widgets/menus/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/widgets/menus/Makefile.in 2007-12-05 15:55:04.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,68 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = widgets/menus --DIST_COMMON = $(libmenusinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" \ -- "$(DESTDIR)$(libmenusincludedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libmenus_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/table/libetable.la \ -- $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- $(am__DEPENDENCIES_1) --am_libmenus_la_OBJECTS = gal-view-menus.lo gal-define-views-dialog.lo \ -- gal-define-views-model.lo gal-view-collection.lo \ -- gal-view-etable.lo gal-view-factory-etable.lo \ -- gal-view-factory.lo gal-view-instance-save-as-dialog.lo \ -- gal-view-instance.lo gal-view-new-dialog.lo gal-view.lo --libmenus_la_OBJECTS = $(am_libmenus_la_OBJECTS) --libmenus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libmenus_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libmenus_la_SOURCES) --DIST_SOURCES = $(libmenus_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --libmenusincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(libmenusinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -127,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -138,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -163,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -188,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -196,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -254,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -278,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -302,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -310,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -317,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -326,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -348,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -378,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -397,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - privsolib_LTLIBRARIES = libmenus.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -@@ -411,6 +396,7 @@ - -DG_LOG_DOMAIN=\"menus\" \ - $(E_UTIL_CFLAGS) - -+ - libmenus_la_SOURCES = \ - gal-view-menus.c \ - gal-define-views-dialog.c \ -@@ -425,12 +411,15 @@ - gal-view.c \ - gal-view-menus.h - -+ - glade_DATA = \ - gal-define-views.glade \ - gal-view-new-dialog.glade \ - gal-view-instance-save-as-dialog.glade - -+ - libmenusincludedir = $(privincludedir)/menus -+ - libmenusinclude_HEADERS = \ - gal-define-views-dialog.h \ - gal-define-views-model.h \ -@@ -443,83 +432,110 @@ - gal-view-new-dialog.h \ - gal-view.h - -+ - libmenus_la_LDFLAGS = $(NO_UNDEFINED) -+ - libmenus_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(E_UTIL_LIBS) - -+ - icons = - EXTRA_DIST = \ - $(icons) \ - $(glade_DATA) - -+subdir = widgets/menus -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+libmenus_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/table/libetable.la \ -+ $(top_builddir)/widgets/misc/libemiscwidgets.la -+am_libmenus_la_OBJECTS = gal-view-menus.lo gal-define-views-dialog.lo \ -+ gal-define-views-model.lo gal-view-collection.lo \ -+ gal-view-etable.lo gal-view-factory-etable.lo \ -+ gal-view-factory.lo gal-view-instance-save-as-dialog.lo \ -+ gal-view-instance.lo gal-view-new-dialog.lo gal-view.lo -+libmenus_la_OBJECTS = $(am_libmenus_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gal-define-views-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-define-views-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-collection.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-etable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-factory-etable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-factory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-instance-save-as-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-instance.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-menus.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view-new-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/gal-view.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libmenus_la_SOURCES) -+DATA = $(glade_DATA) -+ -+HEADERS = $(libmenusinclude_HEADERS) -+ -+DIST_COMMON = $(libmenusinclude_HEADERS) $(srcdir)/Makefile.in \ -+ Makefile.am -+SOURCES = $(libmenus_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/menus/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu widgets/menus/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libmenus.la: $(libmenus_la_OBJECTS) $(libmenus_la_DEPENDENCIES) -- $(libmenus_la_LINK) -rpath $(privsolibdir) $(libmenus_la_OBJECTS) $(libmenus_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libmenus_la_LDFLAGS) $(libmenus_la_OBJECTS) $(libmenus_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -537,66 +553,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gal-view.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+libmenusincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libmenusincludeHEADERS: $(libmenusinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(libmenusincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libmenusincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(libmenusincludedir) - @list='$(libmenusinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(libmenusincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libmenusincludedir)/$$f'"; \ -- $(libmenusincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libmenusincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(libmenusincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libmenusincludedir)/$$f"; \ -+ $(libmenusincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libmenusincludedir)/$$f; \ - done - - uninstall-libmenusincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libmenusinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(libmenusincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(libmenusincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(libmenusincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(libmenusincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -605,7 +647,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -617,11 +658,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -644,23 +684,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -674,10 +719,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(libmenusincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(libmenusincludedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -697,7 +741,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -711,14 +755,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -726,20 +768,12 @@ - install-data-am: install-gladeDATA install-libmenusincludeHEADERS \ - install-privsolibLTLIBRARIES - --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 -@@ -760,26 +794,22 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-libmenusincludeHEADERS \ -- uninstall-privsolibLTLIBRARIES -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-libmenusincludeHEADERS uninstall-privsolibLTLIBRARIES - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-libmenusincludeHEADERS install-man install-pdf \ -- install-pdf-am install-privsolibLTLIBRARIES install-ps \ -- install-ps-am 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-gladeDATA \ -- uninstall-libmenusincludeHEADERS \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-libmenusincludeHEADERS install-man \ -+ install-privsolibLTLIBRARIES 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-gladeDATA \ -+ uninstall-info-am uninstall-libmenusincludeHEADERS \ - uninstall-privsolibLTLIBRARIES - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -ruN evolution-2.12.2.orig/widgets/misc/Makefile.in evolution-2.12.2/widgets/misc/Makefile.in ---- evolution-2.12.2.orig/widgets/misc/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/widgets/misc/Makefile.in 2007-12-05 15:55:04.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,14 +14,16 @@ - - @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 -@@ -33,165 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = test-calendar$(EXEEXT) test-dateedit$(EXEEXT) \ -- test-dropdown-button$(EXEEXT) \ -- test-multi-config-dialog$(EXEEXT) test-info-label$(EXEEXT) --subdir = widgets/misc --DIST_COMMON = $(am__widgetsinclude_HEADERS_DIST) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" \ -- "$(DESTDIR)$(widgetsincludedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libefilterbar_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- libemiscwidgets.la $(am__DEPENDENCIES_1) --am_libefilterbar_la_OBJECTS = e-filter-bar.lo --libefilterbar_la_OBJECTS = $(am_libefilterbar_la_OBJECTS) --libefilterbar_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libefilterbar_la_LDFLAGS) $(LDFLAGS) -o $@ --libemiscwidgets_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/widgets/table/libetable.la \ -- $(top_builddir)/widgets/text/libetext.la \ -- $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ -- $(top_builddir)/a11y/libevolution-a11y.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) --am__libemiscwidgets_la_SOURCES_DIST = e-pilot-settings.h \ -- e-activity-handler.h e-attachment.h e-attachment-bar.h \ -- e-spinner.c e-spinner.h e-calendar.h e-calendar-item.h \ -- e-cell-date-edit.h e-cell-percent.h e-cell-renderer-combo.h \ -- e-charset-picker.h e-combo-cell-editable.h e-config-page.h \ -- e-combo-button.h e-dateedit.h e-dropdown-button.h e-expander.h \ -- e-icon-entry.h e-image-chooser.h e-info-label.h e-map.h \ -- e-multi-config-dialog.h e-search-bar.h e-task-bar.h \ -- e-task-widget.h e-send-options.h e-url-entry.h \ -- e-canvas-background.h e-canvas-utils.h e-canvas-vbox.h \ -- e-canvas.h e-cursors.h e-gui-utils.h e-hsv-utils.h \ -- e-popup-menu.h e-printable.h e-reflow-model.h e-reflow.h \ -- e-selection-model-array.h e-selection-model-simple.h \ -- e-selection-model.h e-unicode.h e-colors.h e-pilot-settings.c \ -- e-activity-handler.c e-calendar.c e-attachment.c \ -- e-attachment-bar.c e-calendar-item.c e-cell-date-edit.c \ -- e-cell-percent.c e-cell-renderer-combo.c e-charset-picker.c \ -- e-combo-cell-editable.c e-config-page.c e-combo-button.c \ -- e-dateedit.c e-dropdown-button.c e-expander.c e-icon-entry.c \ -- e-image-chooser.c e-info-label.c e-map.c \ -- e-multi-config-dialog.c e-search-bar.c e-task-bar.c \ -- e-task-widget.c e-send-options.c e-url-entry.c \ -- e-canvas-background.c e-canvas-utils.c e-canvas-vbox.c \ -- e-canvas.c e-cursors.c e-gui-utils.c e-hsv-utils.c \ -- e-popup-menu.c e-printable.c e-reflow-model.c e-reflow.c \ -- e-selection-model-array.c e-selection-model-simple.c \ -- e-selection-model.c e-unicode.c e-colors.c --am__objects_1 = --am__objects_2 = $(am__objects_1) e-spinner.lo --@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = e-pilot-settings.lo --am_libemiscwidgets_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ -- e-activity-handler.lo e-calendar.lo e-attachment.lo \ -- e-attachment-bar.lo e-calendar-item.lo e-cell-date-edit.lo \ -- e-cell-percent.lo e-cell-renderer-combo.lo e-charset-picker.lo \ -- e-combo-cell-editable.lo e-config-page.lo e-combo-button.lo \ -- e-dateedit.lo e-dropdown-button.lo e-expander.lo \ -- e-icon-entry.lo e-image-chooser.lo e-info-label.lo e-map.lo \ -- e-multi-config-dialog.lo e-search-bar.lo e-task-bar.lo \ -- e-task-widget.lo e-send-options.lo e-url-entry.lo \ -- e-canvas-background.lo e-canvas-utils.lo e-canvas-vbox.lo \ -- e-canvas.lo e-cursors.lo e-gui-utils.lo e-hsv-utils.lo \ -- e-popup-menu.lo e-printable.lo e-reflow-model.lo e-reflow.lo \ -- e-selection-model-array.lo e-selection-model-simple.lo \ -- e-selection-model.lo e-unicode.lo e-colors.lo --libemiscwidgets_la_OBJECTS = $(am_libemiscwidgets_la_OBJECTS) --libemiscwidgets_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libemiscwidgets_la_LDFLAGS) $(LDFLAGS) -o $@ --PROGRAMS = $(noinst_PROGRAMS) --am_test_calendar_OBJECTS = test-calendar.$(OBJEXT) --test_calendar_OBJECTS = $(am_test_calendar_OBJECTS) --test_calendar_DEPENDENCIES = libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_test_dateedit_OBJECTS = test-dateedit.$(OBJEXT) --test_dateedit_OBJECTS = $(am_test_dateedit_OBJECTS) --test_dateedit_DEPENDENCIES = libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_test_dropdown_button_OBJECTS = test-dropdown-button.$(OBJEXT) --test_dropdown_button_OBJECTS = $(am_test_dropdown_button_OBJECTS) --test_dropdown_button_DEPENDENCIES = libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_test_info_label_OBJECTS = test-info-label.$(OBJEXT) --test_info_label_OBJECTS = $(am_test_info_label_OBJECTS) --test_info_label_DEPENDENCIES = libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --am_test_multi_config_dialog_OBJECTS = \ -- test-multi-config-dialog.$(OBJEXT) --test_multi_config_dialog_OBJECTS = \ -- $(am_test_multi_config_dialog_OBJECTS) --test_multi_config_dialog_DEPENDENCIES = libemiscwidgets.la \ -- $(top_builddir)/e-util/libeutil.la $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libefilterbar_la_SOURCES) $(libemiscwidgets_la_SOURCES) \ -- $(test_calendar_SOURCES) $(test_dateedit_SOURCES) \ -- $(test_dropdown_button_SOURCES) $(test_info_label_SOURCES) \ -- $(test_multi_config_dialog_SOURCES) --DIST_SOURCES = $(libefilterbar_la_SOURCES) \ -- $(am__libemiscwidgets_la_SOURCES_DIST) \ -- $(test_calendar_SOURCES) $(test_dateedit_SOURCES) \ -- $(test_dropdown_button_SOURCES) $(test_info_label_SOURCES) \ -- $(test_multi_config_dialog_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --am__widgetsinclude_HEADERS_DIST = e-pilot-settings.h \ -- e-activity-handler.h e-attachment.h e-attachment-bar.h \ -- e-spinner.c e-spinner.h e-calendar.h e-calendar-item.h \ -- e-cell-date-edit.h e-cell-percent.h e-cell-renderer-combo.h \ -- e-charset-picker.h e-combo-cell-editable.h e-config-page.h \ -- e-combo-button.h e-dateedit.h e-dropdown-button.h e-expander.h \ -- e-icon-entry.h e-image-chooser.h e-info-label.h e-map.h \ -- e-multi-config-dialog.h e-search-bar.h e-task-bar.h \ -- e-task-widget.h e-send-options.h e-url-entry.h \ -- e-canvas-background.h e-canvas-utils.h e-canvas-vbox.h \ -- e-canvas.h e-cursors.h e-gui-utils.h e-hsv-utils.h \ -- e-popup-menu.h e-printable.h e-reflow-model.h e-reflow.h \ -- e-selection-model-array.h e-selection-model-simple.h \ -- e-selection-model.h e-unicode.h e-colors.h --widgetsincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(widgetsinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -225,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -236,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -261,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -286,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -294,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -352,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -376,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -400,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -408,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -415,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -424,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -446,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -476,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -495,13 +384,11 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/a11y/widgets \ -@@ -513,19 +400,24 @@ - $(GNOME_PLATFORM_CFLAGS) \ - $(ICONV_CFLAGS) - -+ - privsolib_LTLIBRARIES = \ - libemiscwidgets.la \ - libefilterbar.la - -+ - widgetsincludedir = $(privincludedir)/misc --@ENABLE_PILOT_CONDUITS_FALSE@pilot_sources = -+ - @ENABLE_PILOT_CONDUITS_TRUE@pilot_sources = e-pilot-settings.c --@ENABLE_PILOT_CONDUITS_FALSE@pilot_headers = -+@ENABLE_PILOT_CONDUITS_FALSE@pilot_sources = - @ENABLE_PILOT_CONDUITS_TRUE@pilot_headers = e-pilot-settings.h -+@ENABLE_PILOT_CONDUITS_FALSE@pilot_headers = -+ - glade_DATA = e-send-options.glade \ - gal-categories.glade \ - e-attachment.glade - -+ - widgetsinclude_HEADERS = \ - $(pilot_headers) \ - e-activity-handler.h \ -@@ -572,6 +464,7 @@ - e-unicode.h \ - e-colors.h - -+ - libemiscwidgets_la_SOURCES = \ - $(widgetsinclude_HEADERS) \ - $(pilot_sources) \ -@@ -617,7 +510,9 @@ - e-unicode.c \ - e-colors.c - -+ - libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED) -+ - libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/table/libetable.la \ -@@ -628,136 +523,303 @@ - $(GNOME_PLATFORM_LIBS) \ - $(ICONV_LIBS) - -+ - libefilterbar_la_SOURCES = \ - e-filter-bar.c \ - e-filter-bar.h - -+ - libefilterbar_la_LDFLAGS = $(NO_UNDEFINED) -+ - libefilterbar_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - libemiscwidgets.la \ - $(E_WIDGETS_LIBS) - - -+noinst_PROGRAMS = \ -+ test-calendar \ -+ test-dateedit \ -+ test-dropdown-button \ -+ test-multi-config-dialog \ -+ test-info-label -+ -+ -+ - # test-calendar - test_calendar_SOURCES = \ - test-calendar.c - -+ - test_calendar_LDADD = \ - libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_WIDGETS_LIBS) - - -+ - # test-dateedit - test_dateedit_SOURCES = \ - test-dateedit.c - -+ - test_dateedit_LDADD = \ - libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_WIDGETS_LIBS) - - -+ - # test-dropdown-button - test_dropdown_button_SOURCES = \ - test-dropdown-button.c - -+ - test_dropdown_button_LDADD = \ - libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_WIDGETS_LIBS) - - -+ - # test-multi-config-dialog - test_multi_config_dialog_SOURCES = \ - test-multi-config-dialog.c - -+ - test_multi_config_dialog_LDADD = \ - libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_WIDGETS_LIBS) - - -+ - # test-info-label - test_info_label_SOURCES = \ - test-info-label.c - -+ - test_info_label_LDADD = \ - libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_WIDGETS_LIBS) - -+ - EXTRA_DIST = \ - $(glade_DATA) \ - e-pilot-settings.h \ - e-pilot-settings.c \ - ChangeLog.pre-1-4 - -+subdir = widgets/misc -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libefilterbar_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libfilter.la \ -+@OS_WIN32_TRUE@ libemiscwidgets.la -+@OS_WIN32_FALSE@libefilterbar_la_DEPENDENCIES = libemiscwidgets.la -+am_libefilterbar_la_OBJECTS = e-filter-bar.lo -+libefilterbar_la_OBJECTS = $(am_libefilterbar_la_OBJECTS) -+libemiscwidgets_la_DEPENDENCIES = $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/e-util/libeutil.la \ -+ $(top_builddir)/widgets/table/libetable.la \ -+ $(top_builddir)/widgets/text/libetext.la \ -+ $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ -+ $(top_builddir)/a11y/libevolution-a11y.la -+am__libemiscwidgets_la_SOURCES_DIST = e-pilot-settings.h \ -+ e-activity-handler.h e-attachment.h e-attachment-bar.h \ -+ e-spinner.c e-spinner.h e-calendar.h e-calendar-item.h \ -+ e-cell-date-edit.h e-cell-percent.h e-cell-renderer-combo.h \ -+ e-charset-picker.h e-combo-cell-editable.h e-config-page.h \ -+ e-combo-button.h e-dateedit.h e-dropdown-button.h e-expander.h \ -+ e-icon-entry.h e-image-chooser.h e-info-label.h e-map.h \ -+ e-multi-config-dialog.h e-search-bar.h e-task-bar.h \ -+ e-task-widget.h e-send-options.h e-url-entry.h \ -+ e-canvas-background.h e-canvas-utils.h e-canvas-vbox.h \ -+ e-canvas.h e-cursors.h e-gui-utils.h e-hsv-utils.h \ -+ e-popup-menu.h e-printable.h e-reflow-model.h e-reflow.h \ -+ e-selection-model-array.h e-selection-model-simple.h \ -+ e-selection-model.h e-unicode.h e-colors.h e-pilot-settings.c \ -+ e-activity-handler.c e-calendar.c e-attachment.c \ -+ e-attachment-bar.c e-calendar-item.c e-cell-date-edit.c \ -+ e-cell-percent.c e-cell-renderer-combo.c e-charset-picker.c \ -+ e-combo-cell-editable.c e-config-page.c e-combo-button.c \ -+ e-dateedit.c e-dropdown-button.c e-expander.c e-icon-entry.c \ -+ e-image-chooser.c e-info-label.c e-map.c \ -+ e-multi-config-dialog.c e-search-bar.c e-task-bar.c \ -+ e-task-widget.c e-send-options.c e-url-entry.c \ -+ e-canvas-background.c e-canvas-utils.c e-canvas-vbox.c \ -+ e-canvas.c e-cursors.c e-gui-utils.c e-hsv-utils.c \ -+ e-popup-menu.c e-printable.c e-reflow-model.c e-reflow.c \ -+ e-selection-model-array.c e-selection-model-simple.c \ -+ e-selection-model.c e-unicode.c e-colors.c -+@ENABLE_PILOT_CONDUITS_TRUE@am__objects_1 = -+@ENABLE_PILOT_CONDUITS_FALSE@am__objects_1 = -+am__objects_2 = $(am__objects_1) e-spinner.lo -+@ENABLE_PILOT_CONDUITS_TRUE@am__objects_3 = e-pilot-settings.lo -+@ENABLE_PILOT_CONDUITS_FALSE@am__objects_3 = -+am_libemiscwidgets_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ -+ e-activity-handler.lo e-calendar.lo e-attachment.lo \ -+ e-attachment-bar.lo e-calendar-item.lo e-cell-date-edit.lo \ -+ e-cell-percent.lo e-cell-renderer-combo.lo e-charset-picker.lo \ -+ e-combo-cell-editable.lo e-config-page.lo e-combo-button.lo \ -+ e-dateedit.lo e-dropdown-button.lo e-expander.lo \ -+ e-icon-entry.lo e-image-chooser.lo e-info-label.lo e-map.lo \ -+ e-multi-config-dialog.lo e-search-bar.lo e-task-bar.lo \ -+ e-task-widget.lo e-send-options.lo e-url-entry.lo \ -+ e-canvas-background.lo e-canvas-utils.lo e-canvas-vbox.lo \ -+ e-canvas.lo e-cursors.lo e-gui-utils.lo e-hsv-utils.lo \ -+ e-popup-menu.lo e-printable.lo e-reflow-model.lo e-reflow.lo \ -+ e-selection-model-array.lo e-selection-model-simple.lo \ -+ e-selection-model.lo e-unicode.lo e-colors.lo -+libemiscwidgets_la_OBJECTS = $(am_libemiscwidgets_la_OBJECTS) -+noinst_PROGRAMS = test-calendar$(EXEEXT) test-dateedit$(EXEEXT) \ -+ test-dropdown-button$(EXEEXT) test-multi-config-dialog$(EXEEXT) \ -+ test-info-label$(EXEEXT) -+PROGRAMS = $(noinst_PROGRAMS) -+ -+am_test_calendar_OBJECTS = test-calendar.$(OBJEXT) -+test_calendar_OBJECTS = $(am_test_calendar_OBJECTS) -+test_calendar_DEPENDENCIES = libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+test_calendar_LDFLAGS = -+am_test_dateedit_OBJECTS = test-dateedit.$(OBJEXT) -+test_dateedit_OBJECTS = $(am_test_dateedit_OBJECTS) -+test_dateedit_DEPENDENCIES = libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+test_dateedit_LDFLAGS = -+am_test_dropdown_button_OBJECTS = test-dropdown-button.$(OBJEXT) -+test_dropdown_button_OBJECTS = $(am_test_dropdown_button_OBJECTS) -+test_dropdown_button_DEPENDENCIES = libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+test_dropdown_button_LDFLAGS = -+am_test_info_label_OBJECTS = test-info-label.$(OBJEXT) -+test_info_label_OBJECTS = $(am_test_info_label_OBJECTS) -+test_info_label_DEPENDENCIES = libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+test_info_label_LDFLAGS = -+am_test_multi_config_dialog_OBJECTS = test-multi-config-dialog.$(OBJEXT) -+test_multi_config_dialog_OBJECTS = \ -+ $(am_test_multi_config_dialog_OBJECTS) -+test_multi_config_dialog_DEPENDENCIES = libemiscwidgets.la \ -+ $(top_builddir)/e-util/libeutil.la -+test_multi_config_dialog_LDFLAGS = -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-activity-handler.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-attachment-bar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-attachment.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-calendar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas-background.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas-vbox.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-canvas.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date-edit.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-percent.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-renderer-combo.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-charset-picker.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-colors.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-combo-button.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-combo-cell-editable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-config-page.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cursors.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-dateedit.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-dropdown-button.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-expander.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-filter-bar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-gui-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-hsv-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-icon-entry.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-image-chooser.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-info-label.Plo ./$(DEPDIR)/e-map.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-multi-config-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-pilot-settings.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-popup-menu.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-printable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-reflow-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-reflow.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-search-bar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-selection-model-array.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-selection-model-simple.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-selection-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-send-options.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-spinner.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-task-bar.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-task-widget.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-unicode.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-url-entry.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-calendar.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-dateedit.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-dropdown-button.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-info-label.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/test-multi-config-dialog.Po -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libefilterbar_la_SOURCES) \ -+ $(am__libemiscwidgets_la_SOURCES_DIST) $(test_calendar_SOURCES) \ -+ $(test_dateedit_SOURCES) $(test_dropdown_button_SOURCES) \ -+ $(test_info_label_SOURCES) $(test_multi_config_dialog_SOURCES) -+DATA = $(glade_DATA) -+ -+HEADERS = $(widgetsinclude_HEADERS) -+ -+DIST_COMMON = $(srcdir)/Makefile.in $(widgetsinclude_HEADERS) ChangeLog \ -+ Makefile.am -+SOURCES = $(libefilterbar_la_SOURCES) $(libemiscwidgets_la_SOURCES) $(test_calendar_SOURCES) $(test_dateedit_SOURCES) $(test_dropdown_button_SOURCES) $(test_info_label_SOURCES) $(test_multi_config_dialog_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/misc/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu widgets/misc/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libefilterbar.la: $(libefilterbar_la_OBJECTS) $(libefilterbar_la_DEPENDENCIES) -- $(libefilterbar_la_LINK) -rpath $(privsolibdir) $(libefilterbar_la_OBJECTS) $(libefilterbar_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libefilterbar_la_LDFLAGS) $(libefilterbar_la_OBJECTS) $(libefilterbar_la_LIBADD) $(LIBS) - libemiscwidgets.la: $(libemiscwidgets_la_OBJECTS) $(libemiscwidgets_la_DEPENDENCIES) -- $(libemiscwidgets_la_LINK) -rpath $(privsolibdir) $(libemiscwidgets_la_OBJECTS) $(libemiscwidgets_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libemiscwidgets_la_LDFLAGS) $(libemiscwidgets_la_OBJECTS) $(libemiscwidgets_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -767,22 +829,22 @@ - done - test-calendar$(EXEEXT): $(test_calendar_OBJECTS) $(test_calendar_DEPENDENCIES) - @rm -f test-calendar$(EXEEXT) -- $(LINK) $(test_calendar_OBJECTS) $(test_calendar_LDADD) $(LIBS) -+ $(LINK) $(test_calendar_LDFLAGS) $(test_calendar_OBJECTS) $(test_calendar_LDADD) $(LIBS) - test-dateedit$(EXEEXT): $(test_dateedit_OBJECTS) $(test_dateedit_DEPENDENCIES) - @rm -f test-dateedit$(EXEEXT) -- $(LINK) $(test_dateedit_OBJECTS) $(test_dateedit_LDADD) $(LIBS) -+ $(LINK) $(test_dateedit_LDFLAGS) $(test_dateedit_OBJECTS) $(test_dateedit_LDADD) $(LIBS) - test-dropdown-button$(EXEEXT): $(test_dropdown_button_OBJECTS) $(test_dropdown_button_DEPENDENCIES) - @rm -f test-dropdown-button$(EXEEXT) -- $(LINK) $(test_dropdown_button_OBJECTS) $(test_dropdown_button_LDADD) $(LIBS) -+ $(LINK) $(test_dropdown_button_LDFLAGS) $(test_dropdown_button_OBJECTS) $(test_dropdown_button_LDADD) $(LIBS) - test-info-label$(EXEEXT): $(test_info_label_OBJECTS) $(test_info_label_DEPENDENCIES) - @rm -f test-info-label$(EXEEXT) -- $(LINK) $(test_info_label_OBJECTS) $(test_info_label_LDADD) $(LIBS) -+ $(LINK) $(test_info_label_LDFLAGS) $(test_info_label_OBJECTS) $(test_info_label_LDADD) $(LIBS) - test-multi-config-dialog$(EXEEXT): $(test_multi_config_dialog_OBJECTS) $(test_multi_config_dialog_DEPENDENCIES) - @rm -f test-multi-config-dialog$(EXEEXT) -- $(LINK) $(test_multi_config_dialog_OBJECTS) $(test_multi_config_dialog_LDADD) $(LIBS) -+ $(LINK) $(test_multi_config_dialog_LDFLAGS) $(test_multi_config_dialog_OBJECTS) $(test_multi_config_dialog_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -838,66 +900,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-multi-config-dialog.Po@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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+widgetsincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-widgetsincludeHEADERS: $(widgetsinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(widgetsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(widgetsincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(widgetsincludedir) - @list='$(widgetsinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(widgetsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(widgetsincludedir)/$$f'"; \ -- $(widgetsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(widgetsincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(widgetsincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(widgetsincludedir)/$$f"; \ -+ $(widgetsincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(widgetsincludedir)/$$f; \ - done - - uninstall-widgetsincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(widgetsinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(widgetsincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(widgetsincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(widgetsincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(widgetsincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -906,7 +994,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -918,11 +1005,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -945,23 +1031,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -978,10 +1069,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(widgetsincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(widgetsincludedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -1001,7 +1091,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -1015,14 +1105,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -1030,20 +1118,12 @@ - install-data-am: install-gladeDATA install-privsolibLTLIBRARIES \ - install-widgetsincludeHEADERS - --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 -@@ -1064,26 +1144,23 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-privsolibLTLIBRARIES \ -- uninstall-widgetsincludeHEADERS -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-privsolibLTLIBRARIES uninstall-widgetsincludeHEADERS - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS clean-privsolibLTLIBRARIES \ -- ctags dist-hook 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-gladeDATA install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-privsolibLTLIBRARIES install-ps \ -- install-ps-am install-strip install-widgetsincludeHEADERS \ -- installcheck installcheck-am installdirs maintainer-clean \ -+ ctags distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-exec install-exec-am install-gladeDATA install-info \ -+ install-info-am install-man install-privsolibLTLIBRARIES \ -+ install-strip install-widgetsincludeHEADERS 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-gladeDATA \ -- uninstall-privsolibLTLIBRARIES uninstall-widgetsincludeHEADERS -+ uninstall-info-am uninstall-privsolibLTLIBRARIES \ -+ uninstall-widgetsincludeHEADERS - - - dist-hook: -diff -ruN evolution-2.12.2.orig/widgets/table/Makefile.in evolution-2.12.2/widgets/table/Makefile.in ---- evolution-2.12.2.orig/widgets/table/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/widgets/table/Makefile.in 2007-12-05 15:55:04.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,13 +14,16 @@ - - @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 -@@ -32,87 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = widgets/table --DIST_COMMON = $(libetableinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in ChangeLog --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" \ -- "$(DESTDIR)$(libetableincludedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libetable_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/a11y/libevolution-a11y.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_libetable_la_OBJECTS = e-cell.lo e-cell-checkbox.lo e-cell-combo.lo \ -- e-cell-date.lo e-cell-float.lo e-cell-number.lo \ -- e-cell-pixbuf.lo e-cell-popup.lo e-cell-progress.lo \ -- e-cell-size.lo e-cell-spin-button.lo e-cell-text.lo \ -- e-cell-toggle.lo e-cell-tree.lo e-cell-vbox.lo e-cell-hbox.lo \ -- e-table-click-to-add.lo e-table-col.lo \ -- e-table-column-specification.lo e-table-config.lo \ -- e-table-extras.lo e-table-field-chooser-dialog.lo \ -- e-table-field-chooser-item.lo e-table-field-chooser.lo \ -- e-table-group.lo e-table-group-container.lo \ -- e-table-group-leaf.lo e-table-header.lo e-table-header-item.lo \ -- e-table-header-utils.lo e-table-item.lo \ -- e-table-memory-callbacks.lo e-table-memory-store.lo \ -- e-table-memory.lo e-table-model.lo e-table-one.lo \ -- e-table-scrolled.lo e-table-search.lo \ -- e-table-selection-model.lo e-table-simple.lo \ -- e-table-sort-info.lo e-table-sorted.lo \ -- e-table-sorted-variable.lo e-table-sorter.lo \ -- e-table-sorting-utils.lo e-table-specification.lo \ -- e-table-state.lo e-table-subset.lo e-table-subset-variable.lo \ -- e-table-utils.lo e-table-without.lo e-table.lo \ -- e-tree-memory-callbacks.lo e-tree-memory.lo e-tree-model.lo \ -- e-tree-scrolled.lo e-tree-selection-model.lo e-tree-sorted.lo \ -- e-tree-table-adapter.lo e-tree.lo --libetable_la_OBJECTS = $(am_libetable_la_OBJECTS) --libetable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libetable_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libetable_la_SOURCES) --DIST_SOURCES = $(libetable_la_SOURCES) --gladeDATA_INSTALL = $(INSTALL_DATA) --DATA = $(glade_DATA) --libetableincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(libetableinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -146,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -157,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -182,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -207,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -215,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -273,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -297,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -321,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -329,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -336,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -345,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -367,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -397,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -416,21 +384,20 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ - @OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la - -+ - glade_DATA = \ - e-table-config.glade \ - e-table-config-no-group.glade \ - e-table-field-chooser.glade - -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -@@ -439,7 +406,9 @@ - -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ - -DG_LOG_DOMAIN=\"e-table\" - -+ - privsolib_LTLIBRARIES = libetable.la -+ - libetable_la_SOURCES = \ - e-cell.c \ - e-cell-checkbox.c \ -@@ -502,7 +471,9 @@ - e-tree-table-adapter.c \ - e-tree.c - -+ - libetableincludedir = $(privincludedir)/table -+ - libetableinclude_HEADERS = \ - e-cell.h \ - e-cell-checkbox.h \ -@@ -568,7 +539,9 @@ - e-tree-table-adapter.h \ - e-tree.h - -+ - libetable_la_LDFLAGS = $(NO_UNDEFINED) -+ - libetable_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ -@@ -576,6 +549,7 @@ - $(E_WIDGETS_LIBS) \ - $(GNOME_PLATFORM_LIBS) - -+ - icons = \ - add-col.xpm \ - arrow-down.xpm \ -@@ -587,75 +561,172 @@ - tree-expanded.xpm \ - tree-unexpanded.xpm - -+ - EXTRA_DIST = \ - $(icons) \ - $(glade_DATA) - -+subdir = widgets/table -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libetable_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libetext.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la -+@OS_WIN32_FALSE@libetable_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la -+am_libetable_la_OBJECTS = e-cell.lo e-cell-checkbox.lo e-cell-combo.lo \ -+ e-cell-date.lo e-cell-float.lo e-cell-number.lo \ -+ e-cell-pixbuf.lo e-cell-popup.lo e-cell-progress.lo \ -+ e-cell-size.lo e-cell-spin-button.lo e-cell-text.lo \ -+ e-cell-toggle.lo e-cell-tree.lo e-cell-vbox.lo e-cell-hbox.lo \ -+ e-table-click-to-add.lo e-table-col.lo \ -+ e-table-column-specification.lo e-table-config.lo \ -+ e-table-extras.lo e-table-field-chooser-dialog.lo \ -+ e-table-field-chooser-item.lo e-table-field-chooser.lo \ -+ e-table-group.lo e-table-group-container.lo \ -+ e-table-group-leaf.lo e-table-header.lo e-table-header-item.lo \ -+ e-table-header-utils.lo e-table-item.lo \ -+ e-table-memory-callbacks.lo e-table-memory-store.lo \ -+ e-table-memory.lo e-table-model.lo e-table-one.lo \ -+ e-table-scrolled.lo e-table-search.lo \ -+ e-table-selection-model.lo e-table-simple.lo \ -+ e-table-sort-info.lo e-table-sorted.lo \ -+ e-table-sorted-variable.lo e-table-sorter.lo \ -+ e-table-sorting-utils.lo e-table-specification.lo \ -+ e-table-state.lo e-table-subset.lo e-table-subset-variable.lo \ -+ e-table-utils.lo e-table-without.lo e-table.lo \ -+ e-tree-memory-callbacks.lo e-tree-memory.lo e-tree-model.lo \ -+ e-tree-scrolled.lo e-tree-selection-model.lo e-tree-sorted.lo \ -+ e-tree-table-adapter.lo e-tree.lo -+libetable_la_OBJECTS = $(am_libetable_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-cell-checkbox.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-combo.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-date.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-float.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-hbox.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-number.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-pixbuf.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-popup.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-progress.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-size.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-spin-button.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-text.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-toggle.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-tree.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-cell-vbox.Plo ./$(DEPDIR)/e-cell.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-click-to-add.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-col.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-column-specification.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-config.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-extras.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-field-chooser-dialog.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-field-chooser-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-field-chooser.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-group-container.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-group-leaf.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-group.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-header-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-header-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-header.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-item.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-memory-callbacks.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-memory-store.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-memory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-one.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-scrolled.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-search.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-selection-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-simple.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sort-info.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorted-variable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorted.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-sorting-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-specification.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-state.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-subset-variable.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-subset.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-utils.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-without.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-memory-callbacks.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-memory.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-scrolled.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-selection-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-sorted.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree-table-adapter.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-tree.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libetable_la_SOURCES) -+DATA = $(glade_DATA) -+ -+HEADERS = $(libetableinclude_HEADERS) -+ -+DIST_COMMON = $(libetableinclude_HEADERS) $(srcdir)/Makefile.in \ -+ ChangeLog Makefile.am -+SOURCES = $(libetable_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/table/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu widgets/table/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libetable.la: $(libetable_la_OBJECTS) $(libetable_la_DEPENDENCIES) -- $(libetable_la_LINK) -rpath $(privsolibdir) $(libetable_la_OBJECTS) $(libetable_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libetable_la_LDFLAGS) $(libetable_la_OBJECTS) $(libetable_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -722,66 +793,92 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-tree.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+gladeDATA_INSTALL = $(INSTALL_DATA) - install-gladeDATA: $(glade_DATA) - @$(NORMAL_INSTALL) -- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" -+ $(mkinstalldirs) $(DESTDIR)$(gladedir) - @list='$(glade_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ -- $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f"; \ -+ $(gladeDATA_INSTALL) $$d$$p $(DESTDIR)$(gladedir)/$$f; \ - done - - uninstall-gladeDATA: - @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(gladedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(gladedir)/$$f"; \ -+ rm -f $(DESTDIR)$(gladedir)/$$f; \ - done -+libetableincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libetableincludeHEADERS: $(libetableinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(libetableincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libetableincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(libetableincludedir) - @list='$(libetableinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(libetableincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libetableincludedir)/$$f'"; \ -- $(libetableincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libetableincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(libetableincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetableincludedir)/$$f"; \ -+ $(libetableincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetableincludedir)/$$f; \ - done - - uninstall-libetableincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libetableinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(libetableincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(libetableincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(libetableincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(libetableincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -790,7 +887,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -802,11 +898,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -829,23 +924,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -859,10 +959,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(libetableincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(libetableincludedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -882,7 +981,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -896,14 +995,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -911,20 +1008,12 @@ - install-data-am: install-gladeDATA install-libetableincludeHEADERS \ - install-privsolibLTLIBRARIES - --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 -@@ -945,26 +1034,23 @@ - - ps-am: - --uninstall-am: uninstall-gladeDATA uninstall-libetableincludeHEADERS \ -+uninstall-am: uninstall-gladeDATA uninstall-info-am \ -+ uninstall-libetableincludeHEADERS \ - uninstall-privsolibLTLIBRARIES - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-gladeDATA \ -- install-html install-html-am install-info install-info-am \ -- install-libetableincludeHEADERS install-man install-pdf \ -- install-pdf-am install-privsolibLTLIBRARIES install-ps \ -- install-ps-am 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-gladeDATA \ -- uninstall-libetableincludeHEADERS \ -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-gladeDATA install-info install-info-am \ -+ install-libetableincludeHEADERS install-man \ -+ install-privsolibLTLIBRARIES 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-gladeDATA \ -+ uninstall-info-am uninstall-libetableincludeHEADERS \ - uninstall-privsolibLTLIBRARIES - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -ruN evolution-2.12.2.orig/widgets/text/Makefile.in evolution-2.12.2/widgets/text/Makefile.in ---- evolution-2.12.2.orig/widgets/text/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/widgets/text/Makefile.in 2007-12-05 15:55:04.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,12 +14,16 @@ - - @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 -@@ -31,66 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = widgets/text --DIST_COMMON = $(libetextinclude_HEADERS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(privsolibdir)" \ -- "$(DESTDIR)$(libetextincludedir)" --privsolibLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(privsolib_LTLIBRARIES) --am__DEPENDENCIES_1 = --libetext_la_DEPENDENCIES = $(WIN32_BOOTSTRAP_LIBS) \ -- $(top_builddir)/e-util/libeutil.la \ -- $(top_builddir)/a11y/libevolution-a11y.la \ -- $(top_builddir)/widgets/table/libetable.la \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_libetext_la_OBJECTS = e-entry.lo e-completion-match.lo \ -- e-completion.lo e-completion-callbacks.lo e-completion-view.lo \ -- e-table-text-model.lo e-text-model-repos.lo e-text-model.lo \ -- e-text-model-uri.lo e-text.lo --libetext_la_OBJECTS = $(am_libetext_la_OBJECTS) --libetext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libetext_la_LDFLAGS) $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/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) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(libetext_la_SOURCES) --DIST_SOURCES = $(libetext_la_SOURCES) --libetextincludeHEADERS_INSTALL = $(INSTALL_HEADER) --HEADERS = $(libetextinclude_HEADERS) --ETAGS = etags --CTAGS = ctags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -124,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -135,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -160,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -185,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -193,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -251,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -275,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -299,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -307,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -314,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -323,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -345,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -375,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -394,20 +384,20 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - @OS_WIN32_TRUE@WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - -DG_LOG_DOMAIN=\"e-text\" - -+ - privsolib_LTLIBRARIES = libetext.la -+ - libetext_la_SOURCES = \ - e-entry.c \ - e-completion-match.c \ -@@ -420,7 +410,9 @@ - e-text-model-uri.c \ - e-text.c - -+ - libetextincludedir = $(privincludedir)/text -+ - libetextinclude_HEADERS = \ - e-entry.h \ - e-completion-match.h \ -@@ -433,7 +425,9 @@ - e-text-model-uri.h \ - e-text.h - -+ - libetext_la_LDFLAGS = $(NO_UNDEFINED) -+ - libetext_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ -@@ -442,71 +436,96 @@ - $(GNOME_PLATFORM_LIBS) \ - $(REGEX_LIBS) - -+subdir = widgets/text -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(privsolib_LTLIBRARIES) -+ -+@OS_WIN32_TRUE@libetext_la_DEPENDENCIES = \ -+@OS_WIN32_TRUE@ $(top_builddir)/win32/libemiscwidgets.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/a11y/libevolution-a11y.la \ -+@OS_WIN32_TRUE@ $(top_builddir)/widgets/table/libetable.la -+@OS_WIN32_FALSE@libetext_la_DEPENDENCIES = \ -+@OS_WIN32_FALSE@ $(top_builddir)/e-util/libeutil.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/a11y/libevolution-a11y.la \ -+@OS_WIN32_FALSE@ $(top_builddir)/widgets/table/libetable.la -+am_libetext_la_OBJECTS = e-entry.lo e-completion-match.lo \ -+ e-completion.lo e-completion-callbacks.lo e-completion-view.lo \ -+ e-table-text-model.lo e-text-model-repos.lo e-text-model.lo \ -+ e-text-model-uri.lo e-text.lo -+libetext_la_OBJECTS = $(am_libetext_la_OBJECTS) -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/e-completion-callbacks.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-completion-match.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-completion-view.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-completion.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-entry.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-table-text-model.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-text-model-repos.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-text-model-uri.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/e-text-model.Plo ./$(DEPDIR)/e-text.Plo -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(libetext_la_SOURCES) -+HEADERS = $(libetextinclude_HEADERS) -+ -+DIST_COMMON = $(libetextinclude_HEADERS) $(srcdir)/Makefile.in \ -+ Makefile.am -+SOURCES = $(libetext_la_SOURCES) -+ - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu widgets/text/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu widgets/text/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+privsolibLTLIBRARIES_INSTALL = $(INSTALL) - install-privsolibLTLIBRARIES: $(privsolib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(privsolibdir)" || $(MKDIR_P) "$(DESTDIR)$(privsolibdir)" -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(privsolibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(privsolibdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(privsolibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(privsolibdir)/$$f; \ - else :; fi; \ - done - - uninstall-privsolibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privsolibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privsolibdir)/$$p"; \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(privsolibdir)/$$p; \ - done - - clean-privsolibLTLIBRARIES: - -test -z "$(privsolib_LTLIBRARIES)" || rm -f $(privsolib_LTLIBRARIES) - @list='$(privsolib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libetext.la: $(libetext_la_OBJECTS) $(libetext_la_DEPENDENCIES) -- $(libetext_la_LINK) -rpath $(privsolibdir) $(libetext_la_OBJECTS) $(libetext_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(privsolibdir) $(libetext_la_LDFLAGS) $(libetext_la_OBJECTS) $(libetext_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -523,49 +542,74 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-text.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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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) '$<'` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .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" \ -+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCC_TRUE@ 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 $@ $< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+libetextincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libetextincludeHEADERS: $(libetextinclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(libetextincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libetextincludedir)" -+ $(mkinstalldirs) $(DESTDIR)$(libetextincludedir) - @list='$(libetextinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(libetextincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libetextincludedir)/$$f'"; \ -- $(libetextincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libetextincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(libetextincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetextincludedir)/$$f"; \ -+ $(libetextincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libetextincludedir)/$$f; \ - done - - uninstall-libetextincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libetextinclude_HEADERS)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(libetextincludedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(libetextincludedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(libetextincludedir)/$$f"; \ -+ rm -f $(DESTDIR)$(libetextincludedir)/$$f; \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -574,7 +618,6 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -586,11 +629,10 @@ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -613,23 +655,28 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -643,10 +690,9 @@ - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -+ - installdirs: -- for dir in "$(DESTDIR)$(privsolibdir)" "$(DESTDIR)$(libetextincludedir)"; do \ -- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(privsolibdir) $(DESTDIR)$(libetextincludedir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -666,7 +712,7 @@ - clean-generic: - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -680,14 +726,12 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: -@@ -695,20 +739,12 @@ - install-data-am: install-libetextincludeHEADERS \ - install-privsolibLTLIBRARIES - --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 -@@ -729,26 +765,22 @@ - - ps-am: - --uninstall-am: uninstall-libetextincludeHEADERS \ -+uninstall-am: uninstall-info-am uninstall-libetextincludeHEADERS \ - uninstall-privsolibLTLIBRARIES - --.MAKE: install-am install-strip -- - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-privsolibLTLIBRARIES 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-libetextincludeHEADERS install-man install-pdf \ -- install-pdf-am install-privsolibLTLIBRARIES install-ps \ -- install-ps-am 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-libetextincludeHEADERS \ -- uninstall-privsolibLTLIBRARIES -+ distclean-tags distdir dvi dvi-am info info-am install \ -+ install-am install-data install-data-am install-exec \ -+ install-exec-am install-info install-info-am \ -+ install-libetextincludeHEADERS install-man \ -+ install-privsolibLTLIBRARIES 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-info-am \ -+ uninstall-libetextincludeHEADERS uninstall-privsolibLTLIBRARIES - - # 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 -ruN evolution-2.12.2.orig/win32/Makefile.in evolution-2.12.2/win32/Makefile.in ---- evolution-2.12.2.orig/win32/Makefile.in 2007-12-05 15:50:05.000000000 +0100 -+++ evolution-2.12.2/win32/Makefile.in 2007-12-05 15:55:04.000000000 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# 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,16 @@ - - @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 -@@ -30,26 +35,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = @build@ - host_triplet = @host@ --subdir = win32 --DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --SOURCES = --DIST_SOURCES = --DATA = $(noinst_DATA) --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A11Y_CFLAGS = @A11Y_CFLAGS@ - A11Y_LIBS = @A11Y_LIBS@ - ACLOCAL = @ACLOCAL@ - ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -83,6 +75,8 @@ - DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ - DATASERVER_IDL = @DATASERVER_IDL@ - DBUS_VERSION = @DBUS_VERSION@ -+DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@ -+DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DEVELOPMENT = @DEVELOPMENT@ -@@ -94,6 +88,30 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_CAIRO_FALSE = @ENABLE_CAIRO_FALSE@ -+ENABLE_CAIRO_TRUE = @ENABLE_CAIRO_TRUE@ -+ENABLE_EXCHANGE_FALSE = @ENABLE_EXCHANGE_FALSE@ -+ENABLE_EXCHANGE_TRUE = @ENABLE_EXCHANGE_TRUE@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ -+ENABLE_IMAP4_FALSE = @ENABLE_IMAP4_FALSE@ -+ENABLE_IMAP4_TRUE = @ENABLE_IMAP4_TRUE@ -+ENABLE_IMAPP_FALSE = @ENABLE_IMAPP_FALSE@ -+ENABLE_IMAPP_TRUE = @ENABLE_IMAPP_TRUE@ -+ENABLE_LDAP_FALSE = @ENABLE_LDAP_FALSE@ -+ENABLE_LDAP_TRUE = @ENABLE_LDAP_TRUE@ -+ENABLE_NNTP_FALSE = @ENABLE_NNTP_FALSE@ -+ENABLE_NNTP_TRUE = @ENABLE_NNTP_TRUE@ -+ENABLE_PILOT_CONDUITS_FALSE = @ENABLE_PILOT_CONDUITS_FALSE@ -+ENABLE_PILOT_CONDUITS_TRUE = @ENABLE_PILOT_CONDUITS_TRUE@ -+ENABLE_PURIFY_FALSE = @ENABLE_PURIFY_FALSE@ -+ENABLE_PURIFY_TRUE = @ENABLE_PURIFY_TRUE@ -+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ -+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ -+ENABLE_SMIME_FALSE = @ENABLE_SMIME_FALSE@ -+ENABLE_SMIME_TRUE = @ENABLE_SMIME_TRUE@ -+ENABLE_TEST_COMPONENT_FALSE = @ENABLE_TEST_COMPONENT_FALSE@ -+ENABLE_TEST_COMPONENT_TRUE = @ENABLE_TEST_COMPONENT_TRUE@ - EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ - EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -@@ -119,6 +137,8 @@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GCONFTOOL = @GCONFTOOL@ -+GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ -+GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ - GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ - GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -@@ -144,7 +164,15 @@ - GTKHTML_LIBS = @GTKHTML_LIBS@ - HAL_CFLAGS = @HAL_CFLAGS@ - HAL_LIBS = @HAL_LIBS@ -+HAVE_DTAPPINTEGRATE_FALSE = @HAVE_DTAPPINTEGRATE_FALSE@ -+HAVE_DTAPPINTEGRATE_TRUE = @HAVE_DTAPPINTEGRATE_TRUE@ -+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ -+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ - HAVE_JW = @HAVE_JW@ -+HAVE_JW_FALSE = @HAVE_JW_FALSE@ -+HAVE_JW_TRUE = @HAVE_JW_TRUE@ -+HAVE_KDE_APPLNK_FALSE = @HAVE_KDE_APPLNK_FALSE@ -+HAVE_KDE_APPLNK_TRUE = @HAVE_KDE_APPLNK_TRUE@ - HELP_DIR = @HELP_DIR@ - HTML_DIR = @HTML_DIR@ - ICONV_CFLAGS = @ICONV_CFLAGS@ -@@ -152,7 +180,6 @@ - IDL_INCLUDES = @IDL_INCLUDES@ - IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ - IMPORTERS_LIBS = @IMPORTERS_LIBS@ --INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -210,22 +237,26 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ - MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ - MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ - MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ --MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ - MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MSGMERGE = @MSGMERGE@ - NMN_CFLAGS = @NMN_CFLAGS@ - NMN_LIBS = @NMN_LIBS@ - NM_CFLAGS = @NM_CFLAGS@ - NM_LIBS = @NM_LIBS@ -+NM_SUPPORT_FALSE = @NM_SUPPORT_FALSE@ -+NM_SUPPORT_GLIB_FALSE = @NM_SUPPORT_GLIB_FALSE@ -+NM_SUPPORT_GLIB_TRUE = @NM_SUPPORT_GLIB_TRUE@ -+NM_SUPPORT_TRUE = @NM_SUPPORT_TRUE@ - NO_UNDEFINED = @NO_UNDEFINED@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -@@ -234,6 +265,8 @@ - ORBIT_CONFIG = @ORBIT_CONFIG@ - ORBIT_IDL = @ORBIT_IDL@ - ORBIT_LIBS = @ORBIT_LIBS@ -+OS_WIN32_FALSE = @OS_WIN32_FALSE@ -+OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -258,6 +291,7 @@ - PURIFY = @PURIFY@ - RANLIB = @RANLIB@ - REGEX_LIBS = @REGEX_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SHELL_CFLAGS = @SHELL_CFLAGS@ -@@ -266,6 +300,8 @@ - SOUPTEMP_CFLAGS = @SOUPTEMP_CFLAGS@ - SOUPTEMP_LIBS = @SOUPTEMP_LIBS@ - STRIP = @STRIP@ -+SUNLDAP_FALSE = @SUNLDAP_FALSE@ -+SUNLDAP_TRUE = @SUNLDAP_TRUE@ - THREADS_CFLAGS = @THREADS_CFLAGS@ - THREADS_LIBS = @THREADS_LIBS@ - TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -@@ -273,7 +309,6 @@ - UPGRADE_REVISION = @UPGRADE_REVISION@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ --WARN_CFLAGS = @WARN_CFLAGS@ - XGETTEXT = @XGETTEXT@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -282,21 +317,19 @@ - X_PRE_LIBS = @X_PRE_LIBS@ - 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@ - all_plugins_base = @all_plugins_base@ - all_plugins_experimental = @all_plugins_experimental@ - all_plugins_standard = @all_plugins_standard@ -+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@ --am__tar = @am__tar@ --am__untar = @am__untar@ - bindir = @bindir@ - bindir_in_server_file = @bindir_in_server_file@ - build = @build@ -@@ -304,7 +337,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - componentdir = @componentdir@ - componentdir_in_server_file = @componentdir_in_server_file@ - datadir = @datadir@ -@@ -334,7 +366,6 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ - plugindir = @plugindir@ -@@ -353,11 +384,8 @@ - serverdir = @serverdir@ - sharedstatedir = @sharedstatedir@ - soundsdir = @soundsdir@ --srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --top_builddir = @top_builddir@ --top_srcdir = @top_srcdir@ - viewsdir = @viewsdir@ - EXTRA_DIST = \ - dummy.la \ -@@ -369,6 +397,7 @@ - libevolution-mail.def \ - libfilter.def - -+ - @OS_WIN32_TRUE@BOOTSTRAP_LIBS = \ - @OS_WIN32_TRUE@ libemiscwidgets.la \ - @OS_WIN32_TRUE@ libetable.la \ -@@ -378,69 +407,65 @@ - @OS_WIN32_TRUE@ libevolution-mail.la \ - @OS_WIN32_TRUE@ libfilter.la - -+ - noinst_DATA = $(BOOTSTRAP_LIBS) -+ - CLEANFILES = $(BOOTSTRAP_LIBS) -+subdir = win32 -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+DIST_SOURCES = -+DATA = $(noinst_DATA) -+ -+DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/Makefile'; \ -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu win32/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: - tags: TAGS - TAGS: - - ctags: CTAGS - CTAGS: - -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = .. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - 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"; \ -+ $(mkinstalldirs) "$(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; \ -@@ -454,6 +479,7 @@ - check-am: all-am - check: check-am - all-am: Makefile $(DATA) -+ - installdirs: - install: install-am - install-exec: install-exec-am -@@ -475,7 +501,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -486,34 +512,24 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - - dvi-am: - --html: html-am -- - info: info-am - - info-am: - - install-data-am: - --install-dvi: install-dvi-am -- - install-exec-am: - --install-html: install-html-am -- - install-info: install-info-am - - install-man: - --install-pdf: install-pdf-am -- --install-ps: install-ps-am -- - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -532,20 +548,17 @@ - - ps-am: - --uninstall-am: -- --.MAKE: install-am install-strip -+uninstall-am: uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-info \ -+ install-info-am install-man install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am - - - # Yes, it's a bit silly to repeat the same command sequence here diff --git a/debian/patches/75_automatic_contacts.patch b/debian/patches/75_automatic_contacts.patch deleted file mode 100644 index 7986b86409..0000000000 --- a/debian/patches/75_automatic_contacts.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN evolution-2.12.2.orig/plugins/bbdb/bbdb.c evolution-2.12.2/plugins/bbdb/bbdb.c ---- evolution-2.12.2.orig/plugins/bbdb/bbdb.c 2007-12-05 15:50:03.000000000 +0100 -+++ evolution-2.12.2/plugins/bbdb/bbdb.c 2007-12-05 16:23:22.000000000 +0100 -@@ -271,9 +271,19 @@ - gboolean status; - GError *error = NULL; - -- gconf = gconf_client_get_default (); -+ gboolean enable = TRUE; -+ gconf = gconf_client_get_default (); -+ -+ /* Check to see if we're supposed to be running */ -+ if (type == AUTOMATIC_CONTACTS_ADDRESSBOOK) -+ enable = gconf_client_get_bool (gconf GCONF_KEY_ENABLE NULL); -+ if (!enable) { -+ g_object_unref (G_OBJECT (gconf)); -+ return NULL; -+ } -+ - -- /* Open the appropriate addresbook. */ -+ /* Open the appropriate addresbook. */ - if (type == GAIM_ADDRESSBOOK) - uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL); - else diff --git a/debian/rules b/debian/rules index 87ccee7c2e..c18e2480b9 100755 --- a/debian/rules +++ b/debian/rules @@ -19,8 +19,6 @@ ELIBDIR := usr/lib/evolution/2.12 CFLAGS += -fPIC DEB_CONFIGURE_EXTRA_FLAGS += \ - --with-nspr-includes=/usr/include/nspr \ - --with-nss-includes=/usr/include/nss \ --with-openldap \ --enable-nls \ --without-openssl-includes \ From 12bea219d961f7140741995a50c8932a4d66bfc9 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 11 Mar 2008 21:23:44 +0000 Subject: [PATCH 23/60] add cve-patch to have it in svn git-svn-id: file:///svn/pkg-evolution/unstable/evolution@971 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/patches/80_CVE-2008-0072.patch | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 debian/patches/80_CVE-2008-0072.patch diff --git a/debian/patches/80_CVE-2008-0072.patch b/debian/patches/80_CVE-2008-0072.patch new file mode 100644 index 0000000000..85d7f9d1b7 --- /dev/null +++ b/debian/patches/80_CVE-2008-0072.patch @@ -0,0 +1,49 @@ +Index: mail/em-format.c +=================================================================== +--- mail/em-format.c (revision 35096) ++++ mail/em-format.c (working copy) +@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf + opart = camel_mime_part_new(); + valid = camel_cipher_decrypt(context, part, opart, ex); + if (valid == NULL) { +- em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); ++ em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); + em_format_part_as(emf, stream, part, NULL); + } else { + if (emfc == NULL) +@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C + if (valid == NULL) { + em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_part_as(emf, stream, part, "multipart/mixed"); + } else { + if (emfc == NULL) +@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came + if (valid == NULL) { + em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_part_as(emf, stream, part, "multipart/mixed"); + } else { + if (emfc == NULL) +@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came + if (!valid) { + em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_format_source(emf, stream, ipart); + /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ + camel_exception_free(ex); +@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C + if (!valid) { + em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_format_source(emf, stream, ipart); + /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ + camel_exception_free(ex); From f902d6dfc0a57e3904764d324305bb483745f381 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 11 Mar 2008 21:24:11 +0000 Subject: [PATCH 24/60] remove 80_CVE-2008-0072.patch - applied upstream :) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@972 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/patches/80_CVE-2008-0072.patch | 49 --------------------------- 1 file changed, 49 deletions(-) delete mode 100644 debian/patches/80_CVE-2008-0072.patch diff --git a/debian/patches/80_CVE-2008-0072.patch b/debian/patches/80_CVE-2008-0072.patch deleted file mode 100644 index 85d7f9d1b7..0000000000 --- a/debian/patches/80_CVE-2008-0072.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: mail/em-format.c -=================================================================== ---- mail/em-format.c (revision 35096) -+++ mail/em-format.c (working copy) -@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf - opart = camel_mime_part_new(); - valid = camel_cipher_decrypt(context, part, opart, ex); - if (valid == NULL) { -- em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); -+ em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); - em_format_part_as(emf, stream, part, NULL); - } else { - if (emfc == NULL) -@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C - if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_part_as(emf, stream, part, "multipart/mixed"); - } else { - if (emfc == NULL) -@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came - if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_part_as(emf, stream, part, "multipart/mixed"); - } else { - if (emfc == NULL) -@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came - if (!valid) { - em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_format_source(emf, stream, ipart); - /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ - camel_exception_free(ex); -@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C - if (!valid) { - em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_format_source(emf, stream, ipart); - /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ - camel_exception_free(ex); From 8ea371cda167467e3aaf144e874c2aeede6a3fb4 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 11 Mar 2008 22:03:27 +0000 Subject: [PATCH 25/60] * Upload to experimental * New upstream release * Acknowledge NMU from Security Team: - remove 80_CVE-2008-0072.patch: applied upstream * Bump Standards-version to 3.7.3 * Upgrade build-dep: - libsoup2.4-dev from libsoup2.2-dev * Bump build-deps: - libglib2.0-dev (>= 2.15.3) - libgtk2.0-dev (>= 2.12.0) - evolution-data-server-dev (>= 2.21.92) - evolution-data-server-dev (<< 2.23.0) - gnome-icon-theme (>= 2.19.91) - libbonobo2-dev (>= 2.20.3) - libgtkhtml3.14-dev (>= 3.17.5) - libgnome-pilot2-dev (>= 2.0.15) - libnotify-dev (>= 0.3.0) * Add build-dep: - pilot-link * Update base plugins: - add google-account-setup - add bogo-junk-plugin - wait and evaluate on mono * Update standard plugins: - add audio-inline - rename new-mail-notify to mail-notification - add attachment-reminder - add face - add backup-restore * Update experimental plugins: - remove backup-restore - add external-editor - add tnef-attachments git-svn-id: file:///svn/pkg-evolution/unstable/evolution@973 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 45 ++++++++++++++++ debian/control | 51 +++++++++++-------- debian/evolution-mail.desktop | 4 +- debian/evolution-plugins-experimental.install | 2 +- debian/evolution-plugins.install | 2 +- debian/evolution.install | 20 ++++---- debian/evolution.links | 6 +-- debian/rules | 4 +- 8 files changed, 94 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9bf24cecc8..dfc887a21d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,48 @@ +evolution (2.22.0-1) experimental; urgency=low + + * New upstream release + * Acknowledge NMU from Security Team: + - remove 80_CVE-2008-0072.patch: applied upstream + * Bump Standards-version to 3.7.3 + * Upgrade build-dep: + - libsoup2.4-dev from libsoup2.2-dev + * Bump build-deps: + - libglib2.0-dev (>= 2.15.3) + - libgtk2.0-dev (>= 2.12.0) + - evolution-data-server-dev (>= 2.21.92) + - evolution-data-server-dev (<< 2.23.0) + - gnome-icon-theme (>= 2.19.91) + - libbonobo2-dev (>= 2.20.3) + - libgtkhtml3.14-dev (>= 3.17.5) + - libgnome-pilot2-dev (>= 2.0.15) + - libnotify-dev (>= 0.3.0) + * Add build-dep: + - pilot-link + * Update base plugins: + - add google-account-setup + - add bogo-junk-plugin + - wait and evaluate on mono + * Update standard plugins: + - add audio-inline + - rename new-mail-notify to mail-notification + - add attachment-reminder + - add face + - add backup-restore + * Update experimental plugins: + - remove backup-restore + - add external-editor + - add tnef-attachments + + -- Heikki Henriksen Tue, 11 Mar 2008 22:18:35 +0100 + +evolution (2.12.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix Encrypted Message Version Format String Vulnerability + (CVE-2008-0072). + + -- Thijs Kinkhorst Tue, 04 Mar 2008 21:27:27 +0100 + evolution (2.12.3-1) unstable; urgency=low [ Heikki Henriksen ] diff --git a/debian/control b/debian/control index fe66335994..e737704933 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Jordi Mallach , Loic Minier , Heikki Henriksen , Oystein Gisnas -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 XS-Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution @@ -21,22 +21,22 @@ Build-Depends: debhelper (>= 5.0.0), intltool (>= 0.35.0), libtool, pkg-config (>= 0.16.0), - gnome-icon-theme (>= 1.2.0), + gnome-icon-theme (>= 2.19.91), gnome-doc-utils (>= 0.3.2), gtk-doc-tools (>= 0.6), libatk1.0-dev, libldap2-dev, - libgtkhtml3.14-dev (>= 3.14.0), - libgnome-pilot2-dev, + libgtkhtml3.14-dev (>= 3.17.5), + libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, libnss3-dev, psmisc, - libglib2.0-dev, + libglib2.0-dev (>= 2.15.3), liborbit2-dev (>= 1:2.9.8), - libbonobo2-dev, - evolution-data-server-dev (>= 1.11.92), - evolution-data-server-dev (<< 1.13.0), - libgtk2.0-dev (>= 2.10.0), + libbonobo2-dev (>= 2.20.3), + evolution-data-server-dev (>= 2.21.92), + evolution-data-server-dev (<< 2.23.0), + libgtk2.0-dev (>= 2.12.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), libgnomeui-dev, @@ -56,23 +56,24 @@ Build-Depends: debhelper (>= 5.0.0), libebook1.2-dev (>= 1.9.4), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libnotify-dev, - libsoup2.2-dev (>= 2.2.2), + libnotify-dev (>= 0.3.0), + libsoup2.4-dev, libdbus-1-dev, libexchange-storage1.2-dev (>= 1.9.4), gtkhtml3.14, libgstreamer0.10-dev, - libytnef0-dev + libytnef0-dev, + pilot-link Package: evolution Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 1.11.92), - evolution-data-server (<< 1.13.0), - gtkhtml3.14 (>= 3.14.0), - gnome-icon-theme (>= 1.2.0), + evolution-data-server (>= 2.21.92), + evolution-data-server (<< 2.23.0), + gtkhtml3.14 (>= 3.17.5), + gnome-icon-theme (>= 2.19.91), dbus Recommends: gnome-pilot-conduits (>= 2.0.9), gnome-desktop-data, @@ -91,9 +92,9 @@ Provides: mail-reader, imap-client Replaces: evolution-plugins (<= 2.6.1-2), evolution-common (<< 2.6.2-3) -Conflicts: evolution-exchange (<< 2.11.90), - evolution-plugins (<< 2.11.90), - evolution-plugins-experimental (<< 2.11.90) +Conflicts: evolution-exchange (<< 2.21.90), + evolution-plugins (<< 2.21.90), + evolution-plugins-experimental (<< 2.21.90) Description: groupware suite with mail client and organizer Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. @@ -126,8 +127,11 @@ Description: groupware suite with mail client and organizer - publish-calendar - caldav - imap-features + - google-account-setup - sa-junk-plugin + - bogo-junk-plugin - exchange-operations + - mono Package: evolution-common Architecture: all @@ -190,11 +194,15 @@ Description: standard plugins for Evolution - copy-tool - mail-to-task - mark-calendar-offline + - audio-inline - mailing-list-actions - - new-mail-notify - default-mailer - import-ics-attachments - prefer-plain + - mail-notification + - attachment-reminder + - face + - backup-restore Package: evolution-plugins-experimental Architecture: any @@ -212,8 +220,9 @@ Description: experimental plugins for Evolution Evolution. Use with care. . The following plugins are included. - - backup-restore - folder-unsubscribe - mail-to-meeting - save-attachments + - external-editor - ipod-sync + - tnef-attachments diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index 379b87afa0..96d9a0d214 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -43,5 +43,5 @@ StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution X-GNOME-Bugzilla-Component=Miscellaneous -X-GNOME-Bugzilla-Version=2.12.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.12;evolution-alarm-notify; +X-GNOME-Bugzilla-Version=2.22.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify; diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 7a571980a4..9a16a88213 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1 @@ -debian/tmp/usr/lib/evolution/2.12/plugins/*{backup-restore,folder-unsubscribe,mail-to-meeting,save-attachments,ipod-sync,tnef-attachments}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml} diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index af684836cb..fb23e249fb 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/evolution/2.12/plugins/*{attachment-reminder,audio-inline,bbdb,bogo-junk-plugin,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,new-mail-notify,default-mailer,mail-attachments-import-ics,prefer-plain}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,bogo-junk-plugin,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} debian/lintian/evolution-plugins usr/share/lintian/overrides/ diff --git a/debian/evolution.install b/debian/evolution.install index e1c7303f55..c65a5b0b2d 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -1,16 +1,16 @@ debian/tmp/etc/gconf -debian/tmp/usr/lib/evolution/2.12/*.so.* -debian/tmp/usr/lib/evolution/2.12/components/*.so -debian/tmp/usr/lib/evolution/2.12/conduits/*.so -debian/tmp/usr/lib/evolution/2.12/csv2vcard -debian/tmp/usr/lib/evolution/2.12/killev -debian/tmp/usr/lib/evolution/2.12/evolution-addressbook-export -debian/tmp/usr/lib/evolution/2.12/evolution-addressbook-clean -debian/tmp/usr/lib/evolution/2.12/evolution-alarm-notify -debian/tmp/usr/lib/evolution/2.12/evolution-backup +debian/tmp/usr/lib/evolution/2.22/*.so.* +debian/tmp/usr/lib/evolution/2.22/components/*.so +debian/tmp/usr/lib/evolution/2.22/conduits/*.so +debian/tmp/usr/lib/evolution/2.22/csv2vcard +debian/tmp/usr/lib/evolution/2.22/killev +debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-export +debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-clean +debian/tmp/usr/lib/evolution/2.22/evolution-alarm-notify +debian/tmp/usr/lib/evolution/2.22/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/evolution/2.12/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google-account-setup,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ diff --git a/debian/evolution.links b/debian/evolution.links index f673db27a8..61fe6d9d7f 100644 --- a/debian/evolution.links +++ b/debian/evolution.links @@ -1,3 +1,3 @@ -/usr/lib/evolution/2.12/csv2vcard /usr/bin/csv2vcard -/usr/lib/evolution/2.12/evolution-addressbook-export /usr/bin/evolution-addressbook-export -/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.12.1.gz +/usr/lib/evolution/2.22/csv2vcard /usr/bin/csv2vcard +/usr/lib/evolution/2.22/evolution-addressbook-export /usr/bin/evolution-addressbook-export +/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.22.1.gz diff --git a/debian/rules b/debian/rules index c18e2480b9..e1b854e2f9 100755 --- a/debian/rules +++ b/debian/rules @@ -9,12 +9,12 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') -DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.12 +DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.22 DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts -ELIBDIR := usr/lib/evolution/2.12 +ELIBDIR := usr/lib/evolution/2.22 CFLAGS += -fPIC From bde06e21486444cc012b5130a7ca2d525c5e7de7 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 11 Mar 2008 22:05:18 +0000 Subject: [PATCH 26/60] * Remove patch: - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is removed upstream git-svn-id: file:///svn/pkg-evolution/unstable/evolution@974 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++ debian/patches/70_no-mail-remote-plugin.patch | 49 ------------------- 2 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 debian/patches/70_no-mail-remote-plugin.patch diff --git a/debian/changelog b/debian/changelog index dfc887a21d..547f193af2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ evolution (2.22.0-1) experimental; urgency=low - remove backup-restore - add external-editor - add tnef-attachments + * Remove patch: + - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is + removed upstream -- Heikki Henriksen Tue, 11 Mar 2008 22:18:35 +0100 diff --git a/debian/patches/70_no-mail-remote-plugin.patch b/debian/patches/70_no-mail-remote-plugin.patch deleted file mode 100644 index d3c8644d5c..0000000000 --- a/debian/patches/70_no-mail-remote-plugin.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru evolution-2.12.1.orig/configure evolution-2.12.1/configure ---- evolution-2.12.1.orig/configure 2007-11-13 15:12:10.000000000 +0100 -+++ evolution-2.12.1/configure 2007-11-13 15:13:08.000000000 +0100 -@@ -38032,7 +38032,7 @@ - plugins_standard="$plugins_standard_always" - all_plugins_standard="$plugins_standard" - --plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments" -+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments" - plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS" - all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" - -@@ -38795,7 +38795,7 @@ - EVOLUTION_DIR=`(cd $srcdir; pwd)` - - --ac_config_files="$ac_config_files po/Makefile.in Makefile win32/Makefile a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile a11y/e-table/Makefile a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/widgets/Makefile addressbook/importers/Makefile addressbook/printing/Makefile addressbook/tools/Makefile addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile data/cde_app_root/dt/appconfig/Makefile data/cde_app_root/dt/appconfig/appmanager/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile data/cde_app_root/dt/appconfig/icons/Makefile data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt e-util/Makefile filter/Makefile help/Makefile help/quickref/Makefile help/quickref/C/Makefile help/quickref/de/Makefile help/quickref/es/Makefile help/quickref/it/Makefile help/quickref/fr/Makefile help/quickref/pl/Makefile help/quickref/pt/Makefile help/quickref/sv/Makefile help/quickref/sq/Makefile shell/Makefile shell/evolution-nognome ui/Makefile views/Makefile views/addressbook/Makefile views/calendar/Makefile views/mail/Makefile views/tasks/Makefile views/memos/Makefile widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile calendar/idl/Makefile calendar/conduits/Makefile calendar/conduits/common/Makefile calendar/conduits/todo/Makefile calendar/conduits/calendar/Makefile calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/default/de/Makefile mail/default/es/Makefile mail/default/fi/Makefile mail/default/fr/Makefile mail/default/lt/Makefile mail/default/mk/Makefile mail/default/zh_CN/Makefile mail/default/ja/Makefile mail/default/nl/Makefile mail/default/pl/Makefile mail/default/pt/Makefile mail/default/sv/Makefile mail/importers/Makefile plugins/Makefile plugins/mark-all-read/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile plugins/plugin-manager/Makefile plugins/bbdb/Makefile plugins/audio-inline/Makefile plugins/attachment-reminder/Makefile plugins/mail-notification/Makefile plugins/mail-to-meeting/Makefile plugins/mail-to-task/Makefile plugins/mail-remote/Makefile plugins/mono/Makefile plugins/new-mail-notify/Makefile plugins/subject-thread/Makefile plugins/save-attachments/Makefile plugins/save-calendar/Makefile plugins/select-one-source/Makefile plugins/mark-calendar-offline/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/copy-tool/Makefile plugins/folder-unsubscribe/Makefile plugins/mailing-list-actions/Makefile plugins/itip-formatter/Makefile plugins/backup-restore/Makefile plugins/exchange-operations/Makefile plugins/default-source/Makefile plugins/default-mailer/Makefile plugins/addressbook-file/Makefile plugins/startup-wizard/Makefile plugins/print-message/Makefile plugins/groupwise-account-setup/Makefile plugins/hula-account-setup/Makefile plugins/groupwise-features/Makefile plugins/mail-account-disable/Makefile plugins/sa-junk-plugin/Makefile plugins/bogo-junk-plugin/Makefile plugins/ipod-sync/Makefile plugins/publish-calendar/Makefile plugins/import-ics-attachments/Makefile plugins/imap-features/Makefile plugins/tnef-attachments/Makefile plugins/face/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile tools/Makefile evolution-zip evolution-shell.pc evolution-plugin.pc" -+ac_config_files="$ac_config_files po/Makefile.in Makefile win32/Makefile a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile a11y/e-table/Makefile a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/widgets/Makefile addressbook/importers/Makefile addressbook/printing/Makefile addressbook/tools/Makefile addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile data/cde_app_root/dt/appconfig/Makefile data/cde_app_root/dt/appconfig/appmanager/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Makefile data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile data/cde_app_root/dt/appconfig/icons/Makefile data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt e-util/Makefile filter/Makefile help/Makefile help/quickref/Makefile help/quickref/C/Makefile help/quickref/de/Makefile help/quickref/es/Makefile help/quickref/it/Makefile help/quickref/fr/Makefile help/quickref/pl/Makefile help/quickref/pt/Makefile help/quickref/sv/Makefile help/quickref/sq/Makefile shell/Makefile shell/evolution-nognome ui/Makefile views/Makefile views/addressbook/Makefile views/calendar/Makefile views/mail/Makefile views/tasks/Makefile views/memos/Makefile widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile calendar/idl/Makefile calendar/conduits/Makefile calendar/conduits/common/Makefile calendar/conduits/todo/Makefile calendar/conduits/calendar/Makefile calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/default/de/Makefile mail/default/es/Makefile mail/default/fi/Makefile mail/default/fr/Makefile mail/default/lt/Makefile mail/default/mk/Makefile mail/default/zh_CN/Makefile mail/default/ja/Makefile mail/default/nl/Makefile mail/default/pl/Makefile mail/default/pt/Makefile mail/default/sv/Makefile mail/importers/Makefile plugins/Makefile plugins/mark-all-read/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile plugins/plugin-manager/Makefile plugins/bbdb/Makefile plugins/audio-inline/Makefile plugins/attachment-reminder/Makefile plugins/mail-notification/Makefile plugins/mail-to-meeting/Makefile plugins/mail-to-task/Makefile plugins/mono/Makefile plugins/new-mail-notify/Makefile plugins/subject-thread/Makefile plugins/save-attachments/Makefile plugins/save-calendar/Makefile plugins/select-one-source/Makefile plugins/mark-calendar-offline/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/copy-tool/Makefile plugins/folder-unsubscribe/Makefile plugins/mailing-list-actions/Makefile plugins/itip-formatter/Makefile plugins/backup-restore/Makefile plugins/exchange-operations/Makefile plugins/default-source/Makefile plugins/default-mailer/Makefile plugins/addressbook-file/Makefile plugins/startup-wizard/Makefile plugins/print-message/Makefile plugins/groupwise-account-setup/Makefile plugins/hula-account-setup/Makefile plugins/groupwise-features/Makefile plugins/mail-account-disable/Makefile plugins/sa-junk-plugin/Makefile plugins/bogo-junk-plugin/Makefile plugins/ipod-sync/Makefile plugins/publish-calendar/Makefile plugins/import-ics-attachments/Makefile plugins/imap-features/Makefile plugins/tnef-attachments/Makefile plugins/face/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile tools/Makefile evolution-zip evolution-shell.pc evolution-plugin.pc" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -39680,7 +39680,6 @@ - "plugins/mail-notification/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-notification/Makefile" ;; - "plugins/mail-to-meeting/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-to-meeting/Makefile" ;; - "plugins/mail-to-task/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-to-task/Makefile" ;; -- "plugins/mail-remote/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mail-remote/Makefile" ;; - "plugins/mono/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mono/Makefile" ;; - "plugins/new-mail-notify/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/new-mail-notify/Makefile" ;; - "plugins/subject-thread/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/subject-thread/Makefile" ;; -diff -ru evolution-2.12.1.orig/configure.in evolution-2.12.1/configure.in ---- evolution-2.12.1.orig/configure.in 2007-11-13 15:12:16.000000000 +0100 -+++ evolution-2.12.1/configure.in 2007-11-13 15:13:18.000000000 +0100 -@@ -1700,7 +1700,7 @@ - plugins_standard="$plugins_standard_always" - all_plugins_standard="$plugins_standard" - --plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments" -+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments" - plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS" - all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" - -@@ -2009,7 +2009,6 @@ - plugins/mail-notification/Makefile - plugins/mail-to-meeting/Makefile - plugins/mail-to-task/Makefile --plugins/mail-remote/Makefile - plugins/mono/Makefile - plugins/new-mail-notify/Makefile - plugins/subject-thread/Makefile From c8bb578856fd2d3be29d938c8171a9e17135126e Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Wed, 12 Mar 2008 09:00:19 +0000 Subject: [PATCH 27/60] remove bogo-junk-plugin git-svn-id: file:///svn/pkg-evolution/unstable/evolution@980 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/evolution-plugins.install | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 547f193af2..182afecfc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ evolution (2.22.0-1) experimental; urgency=low - wait and evaluate on mono * Update standard plugins: - add audio-inline + - remove bogo-junk-plugin - rename new-mail-notify to mail-notification - add attachment-reminder - add face @@ -36,7 +37,7 @@ evolution (2.22.0-1) experimental; urgency=low - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is removed upstream - -- Heikki Henriksen Tue, 11 Mar 2008 22:18:35 +0100 + -- Heikki Henriksen Wed, 12 Mar 2008 09:59:57 +0100 evolution (2.12.3-1.1) unstable; urgency=high diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index fb23e249fb..d74e207006 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,bogo-junk-plugin,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} debian/lintian/evolution-plugins usr/share/lintian/overrides/ From 4b1a73a15875181b70c0add684c319ce9c1829d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Mon, 17 Mar 2008 22:10:08 +0000 Subject: [PATCH 28/60] * Bump e-d-s build-deps to 2.21.92 git-svn-id: file:///svn/pkg-evolution/unstable/evolution@988 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 +++++- debian/control | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 182afecfc3..4cc3058ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ evolution (2.22.0-1) experimental; urgency=low + [ Heikki Henriksen ] * New upstream release * Acknowledge NMU from Security Team: - remove 80_CVE-2008-0072.patch: applied upstream @@ -37,7 +38,10 @@ evolution (2.22.0-1) experimental; urgency=low - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is removed upstream - -- Heikki Henriksen Wed, 12 Mar 2008 09:59:57 +0100 + [ Øystein GisnÃ¥s ] + * Bump e-d-s build-deps to 2.21.92 + + -- Øystein GisnÃ¥s Mon, 17 Mar 2008 23:09:37 +0100 evolution (2.12.3-1.1) unstable; urgency=high diff --git a/debian/control b/debian/control index e737704933..161c3ccfbb 100644 --- a/debian/control +++ b/debian/control @@ -48,18 +48,18 @@ Build-Depends: debhelper (>= 5.0.0), libgnomeprintui2.2-dev (>= 2.2.1), libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcamel1.2-dev (>= 1.8.0), - libedataserver1.2-dev (>= 1.11.2), - libegroupwise1.2-dev (>= 1.9.4), - libedataserverui1.2-dev (>= 1.9.4), + libedataserver1.2-dev (>= 2.21.92), + libegroupwise1.2-dev (>= 2.21.92), + libedataserverui1.2-dev (>= 2.21.92), libgnome2-dev, - libecal1.2-dev (>= 1.9.4), - libebook1.2-dev (>= 1.9.4), + libecal1.2-dev (>= 2.21.92), + libebook1.2-dev (>= 2.21.92), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev (>= 0.3.0), libsoup2.4-dev, libdbus-1-dev, - libexchange-storage1.2-dev (>= 1.9.4), + libexchange-storage1.2-dev (>= 2.21.92), gtkhtml3.14, libgstreamer0.10-dev, libytnef0-dev, From 71bc451ed25ba4de340df8cdc71c23995c392eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Mon, 17 Mar 2008 23:47:31 +0000 Subject: [PATCH 29/60] * Sync build-deps of -dev packages with pkg-config files git-svn-id: file:///svn/pkg-evolution/unstable/evolution@992 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 5 +++-- debian/control | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4cc3058ea1..d1651bb36f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,10 +38,11 @@ evolution (2.22.0-1) experimental; urgency=low - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is removed upstream - [ Øystein GisnÃ¥s ] + [ Oystein Gisnas ] * Bump e-d-s build-deps to 2.21.92 + * Sync build-deps of -dev packages with pkg-config files - -- Øystein GisnÃ¥s Mon, 17 Mar 2008 23:09:37 +0100 + -- Oystein Gisnas Tue, 18 Mar 2008 00:46:53 +0100 evolution (2.12.3-1.1) unstable; urgency=high diff --git a/debian/control b/debian/control index 161c3ccfbb..f783afce79 100644 --- a/debian/control +++ b/debian/control @@ -152,8 +152,9 @@ Depends: evolution (= ${binary:Version}), ${misc:Depends}, libgnome2-dev, libgnomeui-dev, - libbonoboui2-dev (>= 2.4.2), - libcamel1.2-dev (>= 1.8.0) + libbonoboui2-dev (>= 2.20.3), + libcamel1.2-dev, + libxml2-dev Description: development library files for Evolution Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. From ff091d10704ea078e71a5cdae80f80f95ce8479e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Sun, 30 Mar 2008 16:37:56 +0000 Subject: [PATCH 30/60] * Bump build-dep libcamel1.2-dev to >= 2.21.92 git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1002 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d1651bb36f..2ce9577cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +evolution (2.22.0-2) expermiental; urgency=low + + * Bump build-dep libcamel1.2-dev to >= 2.21.92 + + -- Oystein Gisnas Sun, 30 Mar 2008 18:37:33 +0200 + evolution (2.22.0-1) experimental; urgency=low [ Heikki Henriksen ] diff --git a/debian/control b/debian/control index f783afce79..05331c6592 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Build-Depends: debhelper (>= 5.0.0), libgnomeprint2.2-dev (>= 2.7.0), libgnomeprintui2.2-dev (>= 2.2.1), libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libcamel1.2-dev (>= 1.8.0), + libcamel1.2-dev (>= 2.21.92), libedataserver1.2-dev (>= 2.21.92), libegroupwise1.2-dev (>= 2.21.92), libedataserverui1.2-dev (>= 2.21.92), From bca99ef9fd763f27d8da8fa6c6d52b9e8f40fca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Sun, 30 Mar 2008 19:13:12 +0000 Subject: [PATCH 31/60] Correct location of Google Calendar plugin git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1003 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/evolution.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/evolution.install b/debian/evolution.install index c65a5b0b2d..cb3deaa651 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -10,7 +10,7 @@ debian/tmp/usr/lib/evolution/2.22/evolution-alarm-notify debian/tmp/usr/lib/evolution/2.22/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google-account-setup,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ From 18fbd8cf5cd4c1ac892a8d2c65ccaf61b907ed3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Mon, 31 Mar 2008 12:52:44 +0000 Subject: [PATCH 32/60] * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991) * Fix file path to Google Calendar plugin (closes: #473309) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1004 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ce9577cfe..9f3fb4cb61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -evolution (2.22.0-2) expermiental; urgency=low +evolution (2.22.0-2) experimental; urgency=low - * Bump build-dep libcamel1.2-dev to >= 2.21.92 + * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991) + * Fix file path to Google Calendar plugin (closes: #473309) - -- Oystein Gisnas Sun, 30 Mar 2008 18:37:33 +0200 + -- Oystein Gisnas Mon, 31 Mar 2008 14:51:04 +0200 evolution (2.22.0-1) experimental; urgency=low From 2368a20c773d55a7d57db9f363a2f42c1ab4b587 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 31 Mar 2008 17:35:24 +0000 Subject: [PATCH 33/60] remove experimental plugin for tnef-attachments for now (closes: #464670) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1005 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 7 +++++++ debian/control | 2 -- debian/evolution-plugins-experimental.install | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f3fb4cb61..dc0c9eb3b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +evolution (2.22.0-3) unstable; urgency=low + + * Upload to unstable + * Remove experimental plugin to handle tnef-attachments (closes: #464670) + + -- Heikki Henriksen Mon, 31 Mar 2008 19:32:10 +0200 + evolution (2.22.0-2) experimental; urgency=low * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991) diff --git a/debian/control b/debian/control index 05331c6592..2f43fbb3c1 100644 --- a/debian/control +++ b/debian/control @@ -62,7 +62,6 @@ Build-Depends: debhelper (>= 5.0.0), libexchange-storage1.2-dev (>= 2.21.92), gtkhtml3.14, libgstreamer0.10-dev, - libytnef0-dev, pilot-link Package: evolution @@ -226,4 +225,3 @@ Description: experimental plugins for Evolution - save-attachments - external-editor - ipod-sync - - tnef-attachments diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 9a16a88213..2e962db2bd 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync}*.{so,eplug,xml} From 7d95aa5c74a4a67eaafd0063b53deb550586b1b2 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 1 Apr 2008 09:50:27 +0000 Subject: [PATCH 34/60] Update DM-Update-Allowed and versioned build-dep on dpkg (>= 1.14.16) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1008 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 8 +++++--- debian/control | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc0c9eb3b1..34c85624a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -evolution (2.22.0-3) unstable; urgency=low +evolution (2.22.0-3) UNRELEASED; urgency=low - * Upload to unstable + * Prepare upload to unstable * Remove experimental plugin to handle tnef-attachments (closes: #464670) + * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump + build-dep on dpkg-dev - -- Heikki Henriksen Mon, 31 Mar 2008 19:32:10 +0200 + -- Heikki Henriksen Tue, 01 Apr 2008 11:06:35 +0200 evolution (2.22.0-2) experimental; urgency=low diff --git a/debian/control b/debian/control index 2f43fbb3c1..89d347a76d 100644 --- a/debian/control +++ b/debian/control @@ -8,13 +8,13 @@ Uploaders: Jordi Mallach , Heikki Henriksen , Oystein Gisnas Standards-Version: 3.7.3 -XS-Dm-Upload-Allowed: yes +Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.37), - dpkg-dev (>= 1.3.19), + dpkg-dev (>= 1.14.16), scrollkeeper, flex, bison, From 3ad89742c42db6020c07fc1fa25130113015ee06 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Wed, 2 Apr 2008 09:57:51 +0000 Subject: [PATCH 35/60] Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1009 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34c85624a1..7d685ccdd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ evolution (2.22.0-3) UNRELEASED; urgency=low * Remove experimental plugin to handle tnef-attachments (closes: #464670) * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump build-dep on dpkg-dev + * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) - -- Heikki Henriksen Tue, 01 Apr 2008 11:06:35 +0200 + -- Heikki Henriksen Wed, 02 Apr 2008 11:56:53 +0200 evolution (2.22.0-2) experimental; urgency=low diff --git a/debian/control b/debian/control index 89d347a76d..a8332c7e6d 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Homepage: http://www.gnome.org/projects/evolution/ Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution Build-Depends: debhelper (>= 5.0.0), - cdbs (>= 0.4.37), + cdbs (>= 0.4.52), dpkg-dev (>= 1.14.16), scrollkeeper, flex, From 38f316ba623518dbe8405546d15c10f3865f176f Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Thu, 3 Apr 2008 09:12:16 +0000 Subject: [PATCH 36/60] revert r1005 and add patch 35_fix_tnef_locale.patch to fix tnef-locale-bug git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1010 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 5 +++-- debian/control | 2 ++ debian/evolution-plugins-experimental.install | 2 +- debian/patches/35_fix_tnef_locale.patch | 12 ++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 debian/patches/35_fix_tnef_locale.patch diff --git a/debian/changelog b/debian/changelog index 7d685ccdd2..e27f76cfe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ evolution (2.22.0-3) UNRELEASED; urgency=low * Prepare upload to unstable - * Remove experimental plugin to handle tnef-attachments (closes: #464670) + * Add patch 35_fix_tnef_locale.patch + - fixes locale-bug in tnef-attachments (closes: #464670) * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump build-dep on dpkg-dev * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) - -- Heikki Henriksen Wed, 02 Apr 2008 11:56:53 +0200 + -- Heikki Henriksen Thu, 03 Apr 2008 11:07:27 +0200 evolution (2.22.0-2) experimental; urgency=low diff --git a/debian/control b/debian/control index a8332c7e6d..3697ea41d5 100644 --- a/debian/control +++ b/debian/control @@ -62,6 +62,7 @@ Build-Depends: debhelper (>= 5.0.0), libexchange-storage1.2-dev (>= 2.21.92), gtkhtml3.14, libgstreamer0.10-dev, + libytnef0-dev, pilot-link Package: evolution @@ -225,3 +226,4 @@ Description: experimental plugins for Evolution - save-attachments - external-editor - ipod-sync + - tnef-attachments diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 2e962db2bd..9a16a88213 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml} diff --git a/debian/patches/35_fix_tnef_locale.patch b/debian/patches/35_fix_tnef_locale.patch new file mode 100644 index 0000000000..bbc902381b --- /dev/null +++ b/debian/patches/35_fix_tnef_locale.patch @@ -0,0 +1,12 @@ +diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am evolution-2.22.0/plugins/tnef-attachments/Makefile.am +--- evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am 2007-10-23 12:06:06.000000000 +0200 ++++ evolution-2.22.0/plugins/tnef-attachments/Makefile.am 2008-04-03 11:06:30.000000000 +0200 +@@ -1,7 +1,7 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ +- -DLOCALEDIR="\"$(LOCALEDIR)\"" \ ++ -DLOCALEDIR="\"$(localedir)\"" \ + $(EVOLUTION_MAIL_CFLAGS) + + @EVO_PLUGIN_RULE@ From 7fec1e59daa568e54d2caae0b2ecfad89cd742c2 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sat, 5 Apr 2008 11:56:33 +0000 Subject: [PATCH 37/60] upload to unstable git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1012 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e27f76cfe6..e768d388d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -evolution (2.22.0-3) UNRELEASED; urgency=low +evolution (2.22.0-3) unstable; urgency=low - * Prepare upload to unstable + * Upload to unstable * Add patch 35_fix_tnef_locale.patch - fixes locale-bug in tnef-attachments (closes: #464670) * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump build-dep on dpkg-dev * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) - -- Heikki Henriksen Thu, 03 Apr 2008 11:07:27 +0200 + -- Heikki Henriksen Sat, 05 Apr 2008 13:53:58 +0200 evolution (2.22.0-2) experimental; urgency=low From 504ca8f09eb389a3008d979e3ed8e697219adeda Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sat, 5 Apr 2008 13:33:58 +0000 Subject: [PATCH 38/60] Update evolution.menu to follow newest menu sub-policy and use Applications/Network/Communication git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1013 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 2 ++ debian/evolution.menu | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e768d388d8..53fd6b546f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ evolution (2.22.0-3) unstable; urgency=low * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump build-dep on dpkg-dev * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) + * Update evolution.menu to follow newest menu sub-policy and use + Applications/Network/Communication -- Heikki Henriksen Sat, 05 Apr 2008 13:53:58 +0200 diff --git a/debian/evolution.menu b/debian/evolution.menu index 54492b5a0e..7f0efc622b 100644 --- a/debian/evolution.menu +++ b/debian/evolution.menu @@ -1,3 +1,3 @@ -?package(evolution):needs="X11" section="Apps/Net" \ +?package(evolution):needs="X11" section="Applications/Network/Communication" \ title="Evolution" command="/usr/bin/evolution" \ hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution.xpm" From c8142d4a24005893f9d82dc39a8681c22adf137a Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sat, 5 Apr 2008 13:36:15 +0000 Subject: [PATCH 39/60] convert copyright to UTF-8 git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1014 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++- debian/copyright | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53fd6b546f..e600249203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ evolution (2.22.0-3) unstable; urgency=low * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) * Update evolution.menu to follow newest menu sub-policy and use Applications/Network/Communication + * Convert copyright to UTF-8 - -- Heikki Henriksen Sat, 05 Apr 2008 13:53:58 +0200 + -- Heikki Henriksen Sat, 05 Apr 2008 15:35:50 +0200 evolution (2.22.0-2) experimental; urgency=low diff --git a/debian/copyright b/debian/copyright index 6662f74c24..24e31afdf2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -67,15 +67,15 @@ Translations Gediminas Paulauskas GNOME PL Team Gustavo Maciel Dias Vieira - Héctor García Alvarez - Jesús Bravo Álvarez + Héctor García Alvarez + Jesús Bravo Ãlvarez Keld Simonsen Kjartan Maraas Matthias Warkus Spiros Papadimitriou Sung-Hyun Nam Szabolcs BAN - Tiago Antão + Tiago Antão Duarte Loreto Valek Filippov Vincent Renardias From fe7d20dae747737fb7bd2eab7d16f0d59acaa9ab Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sat, 5 Apr 2008 16:43:47 +0000 Subject: [PATCH 40/60] update lintian overrides and add override for desktop-command-not-in-package in evolution-common git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1015 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 9 ++++++--- debian/lintian/evolution | 10 +++++----- debian/lintian/evolution-common | 1 + debian/lintian/evolution-plugins | 4 ++-- 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 debian/lintian/evolution-common diff --git a/debian/changelog b/debian/changelog index e600249203..d29275bee1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,13 @@ evolution (2.22.0-3) unstable; urgency=low build-dep on dpkg-dev * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) * Update evolution.menu to follow newest menu sub-policy and use - Applications/Network/Communication - * Convert copyright to UTF-8 + Applications/Network/Communication (fixes lintian-warning) + * Convert copyright to UTF-8 (fixes lintian-warning) + * Update versioned dirs in lintian-overrides + * Add lintian override for desktop-command-not-in-package in + evolution-common - -- Heikki Henriksen Sat, 05 Apr 2008 15:35:50 +0200 + -- Heikki Henriksen Sat, 05 Apr 2008 18:42:34 +0200 evolution (2.22.0-2) experimental; urgency=low diff --git a/debian/lintian/evolution b/debian/lintian/evolution index 2b6963f6df..0b89fcaffa 100644 --- a/debian/lintian/evolution +++ b/debian/lintian/evolution @@ -1,5 +1,5 @@ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libeaddress_conduit.so /usr/lib/evolution/2.12:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libecalendar_common_conduit.so /usr/lib/evolution/2.12:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libecalendar_conduit.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/conduits:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libememo_conduit.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/conduits:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/conduits/libetodo_conduit.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/conduits:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libeaddress_conduit.so /usr/lib/evolution/2.22:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libecalendar_common_conduit.so /usr/lib/evolution/2.22:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libecalendar_conduit.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/conduits:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libememo_conduit.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/conduits:/usr/lib/ +evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libetodo_conduit.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/conduits:/usr/lib/ diff --git a/debian/lintian/evolution-common b/debian/lintian/evolution-common new file mode 100644 index 0000000000..13653b8e25 --- /dev/null +++ b/debian/lintian/evolution-common @@ -0,0 +1 @@ +evolution-common: desktop-command-not-in-package /usr/share/applications/evolution.desktop evolution diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins index d5d8e1c83c..e1dd235883 100644 --- a/debian/lintian/evolution-plugins +++ b/debian/lintian/evolution-plugins @@ -1,2 +1,2 @@ -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/components -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.12/plugins/liborg-gnome-face.so /usr/lib/evolution/2.12:/usr/lib/evolution/2.12/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-face.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/components From 56416b56fdd8cf8ed581679a2a6bd0b6a155f81e Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sat, 5 Apr 2008 17:26:16 +0000 Subject: [PATCH 41/60] install lintian override for evolution-common git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1016 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- debian/evolution-common.install | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d29275bee1..c417215b49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,9 +11,9 @@ evolution (2.22.0-3) unstable; urgency=low * Convert copyright to UTF-8 (fixes lintian-warning) * Update versioned dirs in lintian-overrides * Add lintian override for desktop-command-not-in-package in - evolution-common + evolution-common, and install in evolution-common.install - -- Heikki Henriksen Sat, 05 Apr 2008 18:42:34 +0200 + -- Heikki Henriksen Sat, 05 Apr 2008 19:25:32 +0200 evolution (2.22.0-2) experimental; urgency=low diff --git a/debian/evolution-common.install b/debian/evolution-common.install index 9073c1df02..5af4030edd 100644 --- a/debian/evolution-common.install +++ b/debian/evolution-common.install @@ -6,3 +6,4 @@ debian/tmp/usr/share/icons/hicolor debian/tmp/usr/share/locale debian/tmp/usr/share/gnome debian/tmp/usr/share/omf +debian/lintian/evolution-common usr/share/lintian/overrides/ From 92cd40a93c152c4a0bcd138415c75c24979762cd Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sat, 5 Apr 2008 18:24:16 +0000 Subject: [PATCH 42/60] update tnef_locale.patch to include Makefile.in as well git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1017 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/patches/35_fix_tnef_locale.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/patches/35_fix_tnef_locale.patch b/debian/patches/35_fix_tnef_locale.patch index bbc902381b..e828fe0d6d 100644 --- a/debian/patches/35_fix_tnef_locale.patch +++ b/debian/patches/35_fix_tnef_locale.patch @@ -1,6 +1,6 @@ diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am evolution-2.22.0/plugins/tnef-attachments/Makefile.am --- evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am 2007-10-23 12:06:06.000000000 +0200 -+++ evolution-2.22.0/plugins/tnef-attachments/Makefile.am 2008-04-03 11:06:30.000000000 +0200 ++++ evolution-2.22.0/plugins/tnef-attachments/Makefile.am 2008-04-05 20:21:27.000000000 +0200 @@ -1,7 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ @@ -10,3 +10,15 @@ diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am evolution-2 $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ +diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.in evolution-2.22.0/plugins/tnef-attachments/Makefile.in +--- evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.in 2008-03-09 19:12:25.000000000 +0100 ++++ evolution-2.22.0/plugins/tnef-attachments/Makefile.in 2008-04-05 20:21:14.000000000 +0200 +@@ -393,7 +393,7 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ +- -DLOCALEDIR="\"$(LOCALEDIR)\"" \ ++ -DLOCALEDIR="\"$(localedir)\"" \ + $(EVOLUTION_MAIL_CFLAGS) + + plugin_DATA = org-gnome-tnef-attachments.eplug From 9dc2652c096d53d473d1f891af6dcf0a0a1e66ae Mon Sep 17 00:00:00 2001 From: Pedro Fragoso Date: Mon, 7 Apr 2008 15:38:11 +0000 Subject: [PATCH 43/60] * New upstream bugfix release git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1025 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c417215b49..bb6bacc1cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +evolution (2.22.1-1) UNRELEASED; urgency=low + + * New upstream bugfix release + + -- Pedro Fragoso Mon, 07 Apr 2008 16:35:51 +0100 + evolution (2.22.0-3) unstable; urgency=low * Upload to unstable From 8719351202e37cd126c17425799b6c48a7870f19 Mon Sep 17 00:00:00 2001 From: Pedro Fragoso Date: Mon, 7 Apr 2008 18:31:56 +0000 Subject: [PATCH 44/60] - 35_fix_tnef_locale.patch, Dropped, merged upstream git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1027 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 1 + debian/patches/35_fix_tnef_locale.patch | 24 ------------------------ 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 debian/patches/35_fix_tnef_locale.patch diff --git a/debian/changelog b/debian/changelog index bb6bacc1cd..6d9bd57ea0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ evolution (2.22.1-1) UNRELEASED; urgency=low * New upstream bugfix release + - 35_fix_tnef_locale.patch, Dropped, merged upstream -- Pedro Fragoso Mon, 07 Apr 2008 16:35:51 +0100 diff --git a/debian/patches/35_fix_tnef_locale.patch b/debian/patches/35_fix_tnef_locale.patch deleted file mode 100644 index e828fe0d6d..0000000000 --- a/debian/patches/35_fix_tnef_locale.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am evolution-2.22.0/plugins/tnef-attachments/Makefile.am ---- evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am 2007-10-23 12:06:06.000000000 +0200 -+++ evolution-2.22.0/plugins/tnef-attachments/Makefile.am 2008-04-05 20:21:27.000000000 +0200 -@@ -1,7 +1,7 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -- -DLOCALEDIR="\"$(LOCALEDIR)\"" \ -+ -DLOCALEDIR="\"$(localedir)\"" \ - $(EVOLUTION_MAIL_CFLAGS) - - @EVO_PLUGIN_RULE@ -diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.in evolution-2.22.0/plugins/tnef-attachments/Makefile.in ---- evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.in 2008-03-09 19:12:25.000000000 +0100 -+++ evolution-2.22.0/plugins/tnef-attachments/Makefile.in 2008-04-05 20:21:14.000000000 +0200 -@@ -393,7 +393,7 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -- -DLOCALEDIR="\"$(LOCALEDIR)\"" \ -+ -DLOCALEDIR="\"$(localedir)\"" \ - $(EVOLUTION_MAIL_CFLAGS) - - plugin_DATA = org-gnome-tnef-attachments.eplug From 9938a85362fe612cb063d1cc60e98254d2e4cb40 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Thu, 10 Apr 2008 17:51:25 +0000 Subject: [PATCH 45/60] prepare for release, new upstream closes bugs, update some descriptions git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1029 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d9bd57ea0..189df51dae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -evolution (2.22.1-1) UNRELEASED; urgency=low +evolution (2.22.1-1) unstable; urgency=low + [ Pedro Fragoso ] * New upstream bugfix release - 35_fix_tnef_locale.patch, Dropped, merged upstream - -- Pedro Fragoso Mon, 07 Apr 2008 16:35:51 +0100 + [ Heikki Henriksen ] + * 2.22.1 fixes subject in composer window (closes: #475370) + + -- Heikki Henriksen Thu, 10 Apr 2008 19:43:54 +0200 evolution (2.22.0-3) unstable; urgency=low From c292c516dbf55584a087ed445e4f5a605812ccaf Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 21 Apr 2008 20:23:17 +0000 Subject: [PATCH 46/60] Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1041 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 7 +++++++ debian/evolution-mail.desktop | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 189df51dae..7640f36e21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +evolution (2.22.1-2) unstable; urgency=low + + * debian/evolution-mail.desktop: + Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) + + -- Heikki Henriksen Mon, 21 Apr 2008 22:22:21 +0200 + evolution (2.22.1-1) unstable; urgency=low [ Pedro Fragoso ] diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index 96d9a0d214..bed9e25e05 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -42,6 +42,6 @@ Categories=GNOME;Network; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution -X-GNOME-Bugzilla-Component=Miscellaneous +X-GNOME-Bugzilla-Component=BugBuddyBugs X-GNOME-Bugzilla-Version=2.22.x X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify; From c99ff1f5b319b1092cc3e0075501ed7c5be91289 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Tue, 22 Apr 2008 11:02:09 +0000 Subject: [PATCH 47/60] set as unreleased for now git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1043 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7640f36e21..232328d213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -evolution (2.22.1-2) unstable; urgency=low +evolution (2.22.1-2) UNRELEASED; urgency=low * debian/evolution-mail.desktop: Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) - -- Heikki Henriksen Mon, 21 Apr 2008 22:22:21 +0200 + -- Heikki Henriksen Tue, 22 Apr 2008 13:01:51 +0200 evolution (2.22.1-1) unstable; urgency=low From 159807b6c05afed31e6eeff7f853d84a9c5803b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Sun, 4 May 2008 15:20:40 +0000 Subject: [PATCH 48/60] New upstream bugfix release git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1047 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 232328d213..065d35d435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -evolution (2.22.1-2) UNRELEASED; urgency=low +evolution (2.22.1.1-1) UNRELEASED; urgency=low + [ Heikki Henriksen ] * debian/evolution-mail.desktop: Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) - -- Heikki Henriksen Tue, 22 Apr 2008 13:01:51 +0200 + [ Oystein Gisnas ] + * New upstream bugfix release + + -- Oystein Gisnas Sun, 04 May 2008 17:20:19 +0200 evolution (2.22.1-1) unstable; urgency=low From 87a47fb96e1c4da4dc118e58ee73c93469b43c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Gisn=C3=A5s?= Date: Sun, 4 May 2008 16:17:56 +0000 Subject: [PATCH 49/60] Release 2.22.1.1 git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1051 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 065d35d435..d057c47719 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -evolution (2.22.1.1-1) UNRELEASED; urgency=low +evolution (2.22.1.1-1) unstable; urgency=low [ Heikki Henriksen ] * debian/evolution-mail.desktop: @@ -7,7 +7,7 @@ evolution (2.22.1.1-1) UNRELEASED; urgency=low [ Oystein Gisnas ] * New upstream bugfix release - -- Oystein Gisnas Sun, 04 May 2008 17:20:19 +0200 + -- Oystein Gisnas Sun, 04 May 2008 18:16:59 +0200 evolution (2.22.1-1) unstable; urgency=low From 3004b8fa53e3220382b19056b4b607f9652d17ae Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 26 May 2008 19:48:25 +0000 Subject: [PATCH 50/60] new upstream release + remove deprecated lintian-warnings git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1070 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 9 +++++++++ debian/evolution-plugins.install | 1 - debian/evolution.install | 1 - debian/lintian/evolution | 5 ----- debian/lintian/evolution-plugins | 2 -- 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 debian/lintian/evolution delete mode 100644 debian/lintian/evolution-plugins diff --git a/debian/changelog b/debian/changelog index d057c47719..fc15b27200 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +evolution (2.22.1.1-2) unstable; urgency=low + + * New upstream release + - bugfixes and translation updates + * Remove debian/lintian/{evolution,evolution-plugins} + - private-dir rpaths are finally ignored with lintian >= 1.23.49 + + -- Heikki Henriksen Mon, 26 May 2008 21:43:18 +0200 + evolution (2.22.1.1-1) unstable; urgency=low [ Heikki Henriksen ] diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index d74e207006..73e122278c 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1 @@ debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} -debian/lintian/evolution-plugins usr/share/lintian/overrides/ diff --git a/debian/evolution.install b/debian/evolution.install index cb3deaa651..38c240cc60 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -13,4 +13,3 @@ debian/tmp/usr/lib/bonobo debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ -debian/lintian/evolution usr/share/lintian/overrides/ diff --git a/debian/lintian/evolution b/debian/lintian/evolution deleted file mode 100644 index 0b89fcaffa..0000000000 --- a/debian/lintian/evolution +++ /dev/null @@ -1,5 +0,0 @@ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libeaddress_conduit.so /usr/lib/evolution/2.22:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libecalendar_common_conduit.so /usr/lib/evolution/2.22:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libecalendar_conduit.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/conduits:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libememo_conduit.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/conduits:/usr/lib/ -evolution: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/conduits/libetodo_conduit.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/conduits:/usr/lib/ diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins deleted file mode 100644 index e1dd235883..0000000000 --- a/debian/lintian/evolution-plugins +++ /dev/null @@ -1,2 +0,0 @@ -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/components -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-face.so /usr/lib/evolution/2.22:/usr/lib/evolution/2.22/components From f3257b23d759b2abc87e888444324cee4ff374b6 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 26 May 2008 20:18:05 +0000 Subject: [PATCH 51/60] new upstream i dch git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1072 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc15b27200..b2ffeab01a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -evolution (2.22.1.1-2) unstable; urgency=low +evolution (2.22.2-1) unstable; urgency=low * New upstream release - bugfixes and translation updates * Remove debian/lintian/{evolution,evolution-plugins} - private-dir rpaths are finally ignored with lintian >= 1.23.49 - -- Heikki Henriksen Mon, 26 May 2008 21:43:18 +0200 + -- Heikki Henriksen Mon, 26 May 2008 22:17:30 +0200 evolution (2.22.1.1-1) unstable; urgency=low From 09f2290614507a0557ccb1d7d14df24e424ca2da Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Mon, 26 May 2008 20:46:40 +0000 Subject: [PATCH 52/60] put back rpath-override for evolution-plugins git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1073 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- debian/evolution-plugins.install | 1 + debian/lintian/evolution-plugins | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 debian/lintian/evolution-plugins diff --git a/debian/changelog b/debian/changelog index b2ffeab01a..4d658e53ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,10 @@ evolution (2.22.2-1) unstable; urgency=low * New upstream release - bugfixes and translation updates - * Remove debian/lintian/{evolution,evolution-plugins} + * Remove debian/lintian/evolution - private-dir rpaths are finally ignored with lintian >= 1.23.49 - -- Heikki Henriksen Mon, 26 May 2008 22:17:30 +0200 + -- Heikki Henriksen Mon, 26 May 2008 22:45:36 +0200 evolution (2.22.1.1-1) unstable; urgency=low diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index 73e122278c..d74e207006 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1 +1,2 @@ debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} +debian/lintian/evolution-plugins usr/share/lintian/overrides/ diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins new file mode 100644 index 0000000000..9dbe67befa --- /dev/null +++ b/debian/lintian/evolution-plugins @@ -0,0 +1,2 @@ +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.22/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-face.so /usr/lib/evolution/2.22/components From eece21449cbc5493abbe1e8df2da5c274d764fb6 Mon Sep 17 00:00:00 2001 From: Pedro Fragoso Date: Wed, 2 Jul 2008 22:22:14 +0000 Subject: [PATCH 53/60] * New upstream bugfix release (Closes: #488782) - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 * debian/control: - Add myself to Uploaders - Bump Standards-Version to 3.8.0 (no changes) git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1086 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 10 ++++++++++ debian/control | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d658e53ec..57b0de084a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +evolution (2.22.3.1-1) UNRELEASED; urgency=low + + * New upstream bugfix release (Closes: #488782) + - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 + * debian/control: + - Add myself to Uploaders + - Bump Standards-Version to 3.8.0 (no changes) + + -- Pedro Fragoso Wed, 02 Jul 2008 23:19:45 +0100 + evolution (2.22.2-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 3697ea41d5..9fb0403317 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,9 @@ Uploaders: Jordi Mallach , Margarita Manterola , Loic Minier , Heikki Henriksen , - Oystein Gisnas -Standards-Version: 3.7.3 + Oystein Gisnas , + Pedro Fragoso +Standards-Version: 3.8.0 Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution From 672c782e896643992e3dce8f46b3e276675d10b0 Mon Sep 17 00:00:00 2001 From: Pedro Fragoso Date: Fri, 4 Jul 2008 01:58:12 +0000 Subject: [PATCH 54/60] Add missing close bug and urgency git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1087 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 57b0de084a..c378eefbef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -evolution (2.22.3.1-1) UNRELEASED; urgency=low +evolution (2.22.3.1-1) UNRELEASED; urgency=medium * New upstream bugfix release (Closes: #488782) - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 + (Closes: #484639) + - Set urgency to medium * debian/control: - Add myself to Uploaders - Bump Standards-Version to 3.8.0 (no changes) From f3bbd1025f3e960f82b8103516d62d32651105a9 Mon Sep 17 00:00:00 2001 From: Heikki Henriksen Date: Sun, 6 Jul 2008 11:59:19 +0000 Subject: [PATCH 55/60] upload to unstable git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1095 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c378eefbef..0d69796125 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -evolution (2.22.3.1-1) UNRELEASED; urgency=medium +evolution (2.22.3.1-1) unstable; urgency=medium + [ Pedro Fragoso ] * New upstream bugfix release (Closes: #488782) - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 (Closes: #484639) @@ -8,7 +9,7 @@ evolution (2.22.3.1-1) UNRELEASED; urgency=medium - Add myself to Uploaders - Bump Standards-Version to 3.8.0 (no changes) - -- Pedro Fragoso Wed, 02 Jul 2008 23:19:45 +0100 + -- Heikki Henriksen Sun, 06 Jul 2008 13:51:11 +0200 evolution (2.22.2-1) unstable; urgency=low From 452ea64e687284adcee6c5a39d7e29243744b2b9 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Mon, 15 Dec 2008 21:50:20 +0000 Subject: [PATCH 56/60] * New upstream release. * debian/control: - update build-deps on evolution-data-server. - update build-deps on libgtkhtml3.14-dev and libgtkhtml-editor-dev - drop build-dep on gtkhtml3.14. - add myself to Uploaders:. - add build-dep on automake and libtool. * debian/rules: - run autoreconf at build time to relibtoolize the package. * debian/lintian/evolution-plugins: - update overrides for private rpaths. * debian/evolution-plugins-experimental.install - install lintian override file. git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1106 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 18 +++++++++ debian/control | 37 +++++++++++-------- debian/evolution-mail.desktop | 4 +- debian/evolution-plugins-experimental.install | 3 +- debian/evolution-plugins.install | 2 +- debian/evolution.install | 20 +++++----- debian/evolution.links | 6 +-- debian/lintian/evolution-plugins | 18 ++++++++- debian/lintian/evolution-plugins-experimental | 1 + debian/rules | 20 +++++++++- 10 files changed, 92 insertions(+), 37 deletions(-) create mode 100644 debian/lintian/evolution-plugins-experimental diff --git a/debian/changelog b/debian/changelog index 0d69796125..2601e19e5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +evolution (2.24.2-1) UNRELEASED; urgency=low + + * New upstream release. + * debian/control: + - update build-deps on evolution-data-server. + - update build-deps on libgtkhtml3.14-dev and libgtkhtml-editor-dev + - drop build-dep on gtkhtml3.14. + - add myself to Uploaders:. + - add build-dep on automake and libtool. + * debian/rules: + - run autoreconf at build time to relibtoolize the package. + * debian/lintian/evolution-plugins: + - update overrides for private rpaths. + * debian/evolution-plugins-experimental.install + - install lintian override file. + + -- Yves-Alexis Perez Mon, 15 Dec 2008 18:39:44 +0100 + evolution (2.22.3.1-1) unstable; urgency=medium [ Pedro Fragoso ] diff --git a/debian/control b/debian/control index 9fb0403317..a1264d478b 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Uploaders: Jordi Mallach , Loic Minier , Heikki Henriksen , Oystein Gisnas , - Pedro Fragoso + Pedro Fragoso , + Yves-Alexis Perez Standards-Version: 3.8.0 Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ @@ -27,7 +28,8 @@ Build-Depends: debhelper (>= 5.0.0), gtk-doc-tools (>= 0.6), libatk1.0-dev, libldap2-dev, - libgtkhtml3.14-dev (>= 3.17.5), + libgtkhtml3.14-dev (>= 3.23.5), + libgtkhtml-editor-dev (>= 3.23.5), libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, libnss3-dev, @@ -35,8 +37,8 @@ Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.15.3), liborbit2-dev (>= 1:2.9.8), libbonobo2-dev (>= 2.20.3), - evolution-data-server-dev (>= 2.21.92), - evolution-data-server-dev (<< 2.23.0), + evolution-data-server-dev (>= 2.23.91), + evolution-data-server-dev (<< 2.25.0), libgtk2.0-dev (>= 2.12.0), libbonoboui2-dev (>= 2.4.2), libgnomevfs2-dev (>= 2.4), @@ -48,32 +50,35 @@ Build-Depends: debhelper (>= 5.0.0), libgnomeprint2.2-dev (>= 2.7.0), libgnomeprintui2.2-dev (>= 2.2.1), libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libcamel1.2-dev (>= 2.21.92), - libedataserver1.2-dev (>= 2.21.92), - libegroupwise1.2-dev (>= 2.21.92), - libedataserverui1.2-dev (>= 2.21.92), + libcamel1.2-dev (>= 2.23.91), + libedataserver1.2-dev (>= 2.23.91), + libegroupwise1.2-dev (>= 2.23.91), + libedataserverui1.2-dev (>= 2.23.91), + libebackend1.2-dev (>= 2.23.91), + libgdata1.2-dev (>= 2.23.91), + libgdata-google1.2-dev (>= 2.23.91), libgnome2-dev, - libecal1.2-dev (>= 2.21.92), - libebook1.2-dev (>= 2.21.92), + libecal1.2-dev (>= 2.23.91), + libebook1.2-dev (>= 2.23.91), libdbus-glib-1-dev, libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev (>= 0.3.0), libsoup2.4-dev, libdbus-1-dev, - libexchange-storage1.2-dev (>= 2.21.92), - gtkhtml3.14, + libexchange-storage1.2-dev (>= 2.23.91), libgstreamer0.10-dev, libytnef0-dev, - pilot-link + pilot-link, + automake, + libtool Package: evolution Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 2.21.92), - evolution-data-server (<< 2.23.0), - gtkhtml3.14 (>= 3.17.5), + evolution-data-server (>= 2.24.0), + evolution-data-server (<< 2.25.0), gnome-icon-theme (>= 2.19.91), dbus Recommends: gnome-pilot-conduits (>= 2.0.9), diff --git a/debian/evolution-mail.desktop b/debian/evolution-mail.desktop index bed9e25e05..36147eec63 100644 --- a/debian/evolution-mail.desktop +++ b/debian/evolution-mail.desktop @@ -43,5 +43,5 @@ StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Evolution X-GNOME-Bugzilla-Component=BugBuddyBugs -X-GNOME-Bugzilla-Version=2.22.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify; +X-GNOME-Bugzilla-Version=2.24.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.24;evolution-alarm-notify; diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 9a16a88213..ee7a5f145c 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1 +1,2 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.24/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml} +debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/ diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index d74e207006..3a6441ccd1 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/evolution/2.22/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.24/plugins/*{attachment-reminder,audio-inline,bbdb,subject-thread,save-calendar,select-one-source,copy-tool,face,mail-to-task,mark-calendar-offline,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,face,backup-restore}*.{so,eplug,xml,glade} debian/lintian/evolution-plugins usr/share/lintian/overrides/ diff --git a/debian/evolution.install b/debian/evolution.install index 38c240cc60..a67ed0d521 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -1,15 +1,15 @@ debian/tmp/etc/gconf -debian/tmp/usr/lib/evolution/2.22/*.so.* -debian/tmp/usr/lib/evolution/2.22/components/*.so -debian/tmp/usr/lib/evolution/2.22/conduits/*.so -debian/tmp/usr/lib/evolution/2.22/csv2vcard -debian/tmp/usr/lib/evolution/2.22/killev -debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-export -debian/tmp/usr/lib/evolution/2.22/evolution-addressbook-clean -debian/tmp/usr/lib/evolution/2.22/evolution-alarm-notify -debian/tmp/usr/lib/evolution/2.22/evolution-backup +debian/tmp/usr/lib/evolution/2.24/*.so.* +debian/tmp/usr/lib/evolution/2.24/components/*.so +debian/tmp/usr/lib/evolution/2.24/conduits/*.so +debian/tmp/usr/lib/evolution/2.24/csv2vcard +debian/tmp/usr/lib/evolution/2.24/killev +debian/tmp/usr/lib/evolution/2.24/evolution-addressbook-export +debian/tmp/usr/lib/evolution/2.24/evolution-addressbook-clean +debian/tmp/usr/lib/evolution/2.24/evolution-alarm-notify +debian/tmp/usr/lib/evolution/2.24/evolution-backup debian/tmp/usr/bin debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} +debian/tmp/usr/lib/evolution/2.24/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,publish-calendar,caldav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ diff --git a/debian/evolution.links b/debian/evolution.links index 61fe6d9d7f..f853b3478f 100644 --- a/debian/evolution.links +++ b/debian/evolution.links @@ -1,3 +1,3 @@ -/usr/lib/evolution/2.22/csv2vcard /usr/bin/csv2vcard -/usr/lib/evolution/2.22/evolution-addressbook-export /usr/bin/evolution-addressbook-export -/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.22.1.gz +/usr/lib/evolution/2.24/csv2vcard /usr/bin/csv2vcard +/usr/lib/evolution/2.24/evolution-addressbook-export /usr/bin/evolution-addressbook-export +/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.24.1.gz diff --git a/debian/lintian/evolution-plugins b/debian/lintian/evolution-plugins index 9dbe67befa..e179d7dea3 100644 --- a/debian/lintian/evolution-plugins +++ b/debian/lintian/evolution-plugins @@ -1,2 +1,16 @@ -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.22/components -evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.22/plugins/liborg-gnome-face.so /usr/lib/evolution/2.22/components +# Private rpath +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-default-mailer.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.24 +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-bbdb.so /usr/lib/evolution/2.24 +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so /usr/lib/evolution/2.24 +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-face.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-face.so /usr/lib/evolution/2.24 +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.24 +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.24 +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-prefer-plain.so /usr/lib/evolution/2.24/components +evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-save-calendar.so /usr/lib/evolution/2.24 + diff --git a/debian/lintian/evolution-plugins-experimental b/debian/lintian/evolution-plugins-experimental new file mode 100644 index 0000000000..57b67cea00 --- /dev/null +++ b/debian/lintian/evolution-plugins-experimental @@ -0,0 +1 @@ +evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.24/components diff --git a/debian/rules b/debian/rules index e1b854e2f9..a5cb323cea 100755 --- a/debian/rules +++ b/debian/rules @@ -9,12 +9,12 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') -DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.22 +DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.24 DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts -ELIBDIR := usr/lib/evolution/2.22 +ELIBDIR := usr/lib/evolution/2.24 CFLAGS += -fPIC @@ -35,5 +35,21 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --libexecdir=/usr/lib \ --enable-plugins=experimental +configure/evolution:: + dh_testdir + autoreconf -vfi + clean:: find -name '*.schemas' | xargs rm -f + +#binary-install/evolution-plugins:: +# chrpath -d -k $(CURDIR)/debian/evolution-plugins/usr/lib/evolution/2.24/plugins/*.so +# +#binary-install/evolution-plugins-experimental:: +# chrpath -d -k $(CURDIR)/debian/evolution-plugins-experimental/usr/lib/evolution/2.24/plugins/*.so +# +#binary-install/evolution:: +# chrpath -d -k $(CURDIR)/debian/evolution/usr/bin/evolution +# chrpath -d -k $(CURDIR)/debian/evolution/$(ELIBDIR)/{killev,evolution-addressbook-export,evolution-alarm-notify,evolution-backup} +# chrpath -d -k $(CURDIR)/debian/evolution/$(ELIBDIR)/*.so* +# chrpath -d -k $(CURDIR)/debian/evolution/$(ELIBDIR)/*/*.so* From b2e82ce395dd40aafe76a49139458d5fd9f9772e Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 27 Jan 2009 22:31:36 +0000 Subject: [PATCH 57/60] new upstream point release run autoreconf at correct time bump build-dep on eds to be sure to pick the new one git-svn-id: file:///svn/pkg-evolution/experimental/evolution@1115 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2601e19e5e..9ccd4bb110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -evolution (2.24.2-1) UNRELEASED; urgency=low +evolution (2.24.3-1) UNRELEASED; urgency=low * New upstream release. * debian/control: @@ -14,7 +14,7 @@ evolution (2.24.2-1) UNRELEASED; urgency=low * debian/evolution-plugins-experimental.install - install lintian override file. - -- Yves-Alexis Perez Mon, 15 Dec 2008 18:39:44 +0100 + -- Yves-Alexis Perez Tue, 27 Jan 2009 20:11:50 +0100 evolution (2.22.3.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index a1264d478b..310b04e890 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.15.3), liborbit2-dev (>= 1:2.9.8), libbonobo2-dev (>= 2.20.3), - evolution-data-server-dev (>= 2.23.91), + evolution-data-server-dev (>= 2.24.3), evolution-data-server-dev (<< 2.25.0), libgtk2.0-dev (>= 2.12.0), libbonoboui2-dev (>= 2.4.2), diff --git a/debian/rules b/debian/rules index a5cb323cea..828cb94fc7 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --libexecdir=/usr/lib \ --enable-plugins=experimental -configure/evolution:: +configure: dh_testdir autoreconf -vfi From 3da2e5e3c3256fcca96052ebdbe6a7d5dcc70839 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 28 Feb 2009 18:10:09 +0000 Subject: [PATCH 58/60] - drop obsolete Conflicts/Replaces. - ignore plugin folder in dh_makeshlibs. - ship email-custom-header, evolution-webdav and templates plugin. git-svn-id: file:///svn/pkg-evolution/experimental/evolution@1116 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 7 +++++-- debian/control | 14 +++++--------- debian/evolution-plugins-experimental.install | 3 ++- debian/lintian/evolution-plugins-experimental | 2 ++ debian/rules | 9 +++++---- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ccd4bb110..133b28c076 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -evolution (2.24.3-1) UNRELEASED; urgency=low +evolution (2.24.5-1) unstable; urgency=low * New upstream release. * debian/control: @@ -7,14 +7,17 @@ evolution (2.24.3-1) UNRELEASED; urgency=low - drop build-dep on gtkhtml3.14. - add myself to Uploaders:. - add build-dep on automake and libtool. + - drop obsolete Conflicts/Replaces. * debian/rules: - run autoreconf at build time to relibtoolize the package. + - ignore plugin folder in dh_makeshlibs. * debian/lintian/evolution-plugins: - update overrides for private rpaths. * debian/evolution-plugins-experimental.install - install lintian override file. + - ship email-custom-header, evolution-webdav and templates plugin. - -- Yves-Alexis Perez Tue, 27 Jan 2009 20:11:50 +0100 + -- Yves-Alexis Perez Sat, 28 Feb 2009 15:24:22 +0100 evolution (2.22.3.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 310b04e890..4976d396db 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 5.0.0), gtk-doc-tools (>= 0.6), libatk1.0-dev, libldap2-dev, - libgtkhtml3.14-dev (>= 3.23.5), + libgtkhtml3.14-dev (>= 3.24.5), libgtkhtml-editor-dev (>= 3.23.5), libgnome-pilot2-dev (>= 2.0.15), libkrb5-dev, @@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.15.3), liborbit2-dev (>= 1:2.9.8), libbonobo2-dev (>= 2.20.3), - evolution-data-server-dev (>= 2.24.3), + evolution-data-server-dev (>= 2.24.5), evolution-data-server-dev (<< 2.25.0), libgtk2.0-dev (>= 2.12.0), libbonoboui2-dev (>= 2.4.2), @@ -96,11 +96,6 @@ Suggests: bug-buddy, evolution-plugins-experimental Provides: mail-reader, imap-client -Replaces: evolution-plugins (<= 2.6.1-2), - evolution-common (<< 2.6.2-3) -Conflicts: evolution-exchange (<< 2.21.90), - evolution-plugins (<< 2.21.90), - evolution-plugins-experimental (<< 2.21.90) Description: groupware suite with mail client and organizer Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. @@ -142,7 +137,6 @@ Description: groupware suite with mail client and organizer Package: evolution-common Architecture: all Depends: ${misc:Depends} -Replaces: evolution (<< 2.6.2-1) Recommends: evolution Description: architecture independent files for Evolution Evolution is a groupware suite which integrates mail, calendar, @@ -216,7 +210,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution (= ${binary:Version}), -Replaces: evolution-plugins (<< 2.6.2-1) Description: experimental plugins for Evolution Evolution is a groupware suite which integrates mail, calendar, address book, to-do list and memo tools. @@ -233,3 +226,6 @@ Description: experimental plugins for Evolution - external-editor - ipod-sync - tnef-attachments + - email-custom-headers + - evolution-webdav + - templates diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index ee7a5f145c..6ce89e4e03 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1,2 +1,3 @@ -debian/tmp/usr/lib/evolution/2.24/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.24/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments,email-custom-header,evolution-webdav,templates}*.{so,eplug,xml} +debian/tmp/usr/lib/evolution/2.24/plugins/templates.glade debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/ diff --git a/debian/lintian/evolution-plugins-experimental b/debian/lintian/evolution-plugins-experimental index 57b67cea00..31252f7c92 100644 --- a/debian/lintian/evolution-plugins-experimental +++ b/debian/lintian/evolution-plugins-experimental @@ -1 +1,3 @@ evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.24/components +evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.24/components +evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.24/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.24/components diff --git a/debian/rules b/debian/rules index 828cb94fc7..0bf27893c4 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,14 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') -DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.24 -DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -DEB_DH_MAKESHLIBS_ARGS_evolution-plugins += --noscripts -DEB_DH_MAKESHLIBS_ARGS_evolution-plugins-experimental += --noscripts ELIBDIR := usr/lib/evolution/2.24 +DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.24 +DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components +DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins + + CFLAGS += -fPIC DEB_CONFIGURE_EXTRA_FLAGS += \ From fd2e43130dcb863393f1814c18f61be29008d9c4 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 28 Feb 2009 21:24:26 +0000 Subject: [PATCH 59/60] upload git-svn-id: file:///svn/pkg-evolution/experimental/evolution@1123 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 133b28c076..c2243ecc79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -evolution (2.24.5-1) unstable; urgency=low +evolution (2.24.5-1) experimental; urgency=low * New upstream release. * debian/control: @@ -17,7 +17,7 @@ evolution (2.24.5-1) unstable; urgency=low - install lintian override file. - ship email-custom-header, evolution-webdav and templates plugin. - -- Yves-Alexis Perez Sat, 28 Feb 2009 15:24:22 +0100 + -- Yves-Alexis Perez Sat, 28 Feb 2009 20:34:59 +0100 evolution (2.22.3.1-1) unstable; urgency=medium From a4688ceb06e37c14324418600f2f48e6a4b2a74f Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sun, 8 Mar 2009 15:11:43 +0000 Subject: [PATCH 60/60] upload to unstable git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1137 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c2243ecc79..2459a91ddd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +evolution (2.24.5-2) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Sun, 08 Mar 2009 13:42:30 +0100 + evolution (2.24.5-1) experimental; urgency=low * New upstream release.